Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 14:48:24 +0000 (10:48 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 14:48:24 +0000 (10:48 -0400)
commit893a5cb26ee5cdde632f84aebcc14f9bdf20610e
tree5a32e01754cbdc6b86d04bccdd3d4bd6f8e14765
parent8c0a45dd65a413f92274bb4a5b74627cf3545551
parentbb0958952e1a07da214cb7e39a2f0811d0ecae0d
Merge branch 'hotfix/1.0.18'