Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Fri, 3 Nov 2017 21:08:00 +0000 (17:08 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 3 Nov 2017 21:08:00 +0000 (17:08 -0400)
commitef010065b2fb17b5e914986e015f3115bec67b29
tree0166292ba7e8391bd69cad6977ee4993a9767e0c
parentfc65c74102fc5020a862a08ed4557c6085cb3df4
parent5767f1ffe4e48a601c22aa9f8e26c9d35828ca0c
Merge branch 'hotfix/1.0.18'