Merge branch 'hotfix/1.2.29' v1.2.29
authorLaury GvR <laury@gaslightmedia.com>
Wed, 18 Apr 2018 17:07:44 +0000 (13:07 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 18 Apr 2018 17:07:44 +0000 (13:07 -0400)
commitc6e8d01998b0368d1732e58e5efbdd33599bafd0
tree644c2a75f1e7b11b37aeb4e082d4f7ce26521131
parent9b5ccab0b2b8739d6c489eec2c1a571ccd6df3db
parent1952a51e98f011432081458e11e37e0e8f0b7aa2
Merge branch 'hotfix/1.2.29'