Merge branch 'hotfix/1.0.25' v1.0.25
authorLaury GvR <laury@gaslightmedia.com>
Mon, 20 Nov 2017 19:15:00 +0000 (14:15 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 20 Nov 2017 19:15:00 +0000 (14:15 -0500)
commit0dc30f8c415c3a2b830b4e16ee0401c1d2d7a833
tree72bb5cec102b08e186b7d624add1f34a51f18461
parent162232045e0929420c4ed3c731d370a6c4a386f6
parent1d5d55f9c46bf1eb37fd64b136f00c287714747e
Merge branch 'hotfix/1.0.25'