Merge branch 'hotfix/1.1.37' v1.1.37
authorLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 19:20:56 +0000 (14:20 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 19:20:56 +0000 (14:20 -0500)
commit431ed4f5c81adc61f4cf1e1a77dabe08666ba8a8
treec8b5135703e3f8d084acdec1254afa5218d4d30f
parenta49d6addd9837c09e032308965afbf784d3f06ba
parent1e3695005976ca077775e05e45c3d9af04d4b32b
Merge branch 'hotfix/1.1.37'