Merge branch 'hotfix/1.2.17' v1.2.17
authorLaury GvR <laury@gaslightmedia.com>
Tue, 31 Jan 2017 13:54:28 +0000 (08:54 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 31 Jan 2017 13:54:28 +0000 (08:54 -0500)
commit854f675735d7db75cb3ae06ced16caf88495fd8a
tree9f3e5e80dd003785dcfa118ac7c721f7abed48db
parent0d58d256e7abdcdef4104196bf83720d39ce9fb3
parentfdde404ad46add9f13541824e6147ddc4d6c3acf
Merge branch 'hotfix/1.2.17'