Merge branch 'hotfix/1.1.38' v1.1.38
authorLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 20:10:01 +0000 (15:10 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 20:10:01 +0000 (15:10 -0500)
commit13d2482831e26cd61339833cf8a0aa6d762a1b47
tree3d5778dc6d99c36b39c8d26a8f7214e9ec07ad9b
parent431ed4f5c81adc61f4cf1e1a77dabe08666ba8a8
parent3f28e53c9aadc36ec9f53aa065aa8d092a8ceec0
Merge branch 'hotfix/1.1.38'