Merge branch 'hotfix/1.0.14' v1.0.14
authorLaury GvR <laury@gaslightmedia.com>
Fri, 30 Jun 2017 18:44:10 +0000 (14:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 30 Jun 2017 18:44:10 +0000 (14:44 -0400)
commit68d54da4356a5f309014cc65a9c9b253e003deb5
tree7a4c5dd7b9aaed0803ed14a85928089f75bb9457
parent01fe51c796366b6fb00ab2c241f1658f100ccf3f
parentdad1119c57a800402c20df0408347cdf77ce40a6
Merge branch 'hotfix/1.0.14'