Merge branch 'hotfix/1.2.5' v1.2.5
authorLaury GvR <laury@gaslightmedia.com>
Thu, 14 Dec 2017 19:34:46 +0000 (14:34 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 14 Dec 2017 19:34:46 +0000 (14:34 -0500)
commite62a7eb5ca972d4bf0110e758e03fe7f47ad2729
tree88d354e12735eeac79a860260b483269adf5bf45
parent82347870eeb22c78711b9d40b65b36c05685d32c
parent1c5f3b036f34f80822f114380fe9031047671662
Merge branch 'hotfix/1.2.5'