Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Mon, 31 Oct 2016 19:31:45 +0000 (15:31 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 31 Oct 2016 19:31:45 +0000 (15:31 -0400)
commit4ee1437c8e3a4d110013642982e5c6d1cd35fe9e
tree591c4066706dd44c7e4ed74321d1cb46d6054dcc
parent68af1e730516de93ea0fe61a3c762bfe089892a4
parent198be1591046802bb7e6411e8bb1efff621ab54c
Merge branch 'hotfix/1.0.5'