Merge branch 'hotfix/1.5.18' v1.5.18
authorLaury GvR <laury@gaslightmedia.com>
Tue, 20 Feb 2018 21:46:30 +0000 (16:46 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 20 Feb 2018 21:46:30 +0000 (16:46 -0500)
commitceb26abf3a56e2c377462dd4139cc38a5f28d365
tree2d0769ce8d129704414994b638789807a9669082
parent1a51e470aaffd6270c95a44c0c82f58d687ed364
parent4e2cd1edb26859a46a051f81d940f63c0ab6694a
Merge branch 'hotfix/1.5.18'