Merge branch 'hotfix/1.2.9' v1.2.9
authorLaury GvR <laury@gaslightmedia.com>
Fri, 15 Dec 2017 22:01:41 +0000 (17:01 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 15 Dec 2017 22:01:41 +0000 (17:01 -0500)
commite5dcde9adb4c0595a63942623d0092a474b38478
treeacb1fc59a06f5a48d1af86b08d0ad7c010cf1125
parentd138aec832441b226bf4193c365c8a2c02a13855
parentda126af430fa974591ed670b8ead3f07135450fe
Merge branch 'hotfix/1.2.9'