Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Mon, 20 Jun 2016 16:04:11 +0000 (12:04 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 20 Jun 2016 16:04:11 +0000 (12:04 -0400)
commit7f6c8f666137746a2700d437f25797a1c353f32c
tree10dd65a240d0f21d57065c4e2e0e16253e9ae5f6
parent3315d8da23a8f29c7daca71ceedced3f957b7774
parentf1240359eb2cd260d27fa126cc416dd9215a1e5c
Merge branch 'hotfix/1.0.5'