Merge tag 'v1.0.25' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 20 Nov 2017 19:15:04 +0000 (14:15 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 20 Nov 2017 19:15:04 +0000 (14:15 -0500)
commit60a73dc3ff4aa10c578e17691a608e810c7eeacd
tree72bb5cec102b08e186b7d624add1f34a51f18461
parentc1603c89fed91411bf1f4b8fbc461fe64becd800
parent0dc30f8c415c3a2b830b4e16ee0401c1d2d7a833
Merge tag 'v1.0.25' into develop

v1.0.25