Merge branch 'hotfix/1.0.24' v1.0.24
authorLaury GvR <laury@gaslightmedia.com>
Thu, 18 May 2017 15:55:05 +0000 (11:55 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 18 May 2017 15:55:05 +0000 (11:55 -0400)
commit6f4bd2fa060aa84d7ff705ddb3f9d11f40174978
tree7da6b26ac32b3e6e9a044b24335ce691d74706aa
parent5427722c48f2e168e0b6377b1ab8d03510254dae
parentb18cff93ed5f991b593ee37212b18b4136c7087c
Merge branch 'hotfix/1.0.24'