Merge tag 'v1.2.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 14 Dec 2017 19:34:52 +0000 (14:34 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 14 Dec 2017 19:34:52 +0000 (14:34 -0500)
commitbd54a2165611264b6c2f9da80e86ffa0baf67c24
tree88d354e12735eeac79a860260b483269adf5bf45
parent985812fbb97476c151591b49d639ca4c886c885c
parente62a7eb5ca972d4bf0110e758e03fe7f47ad2729
Merge tag 'v1.2.5' into develop

v1.2.5