Merge branch 'hotfix/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Mon, 31 Oct 2016 20:09:10 +0000 (16:09 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 31 Oct 2016 20:09:10 +0000 (16:09 -0400)
commitfbea427d6295dc48adba4db6dcdb07ba680d0706
treeedf4a656f53996061ee1d1469a293340f08a352d
parent4ee1437c8e3a4d110013642982e5c6d1cd35fe9e
parentc8c407f5d46d66b794d04ac2df2194a720306695
Merge branch 'hotfix/1.0.6'