Merge branch 'hotfix/1.1.25' v1.1.25
authorLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 20:07:38 +0000 (15:07 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 20:07:38 +0000 (15:07 -0500)
commit49207f9cdb0f97a43419ccf5943e74453e5619b8
tree147d9444f1f2e4a4c6aa5f4ecfc0df322b023b40
parentf3271e9ad7502e5613250ce2177129939e85e778
parentfdeee0050e71686dbb847d0ec231e18f2a8f798d
Merge branch 'hotfix/1.1.25'