Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:01:29 +0000 (12:01 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:01:29 +0000 (12:01 -0400)
commita990a350c1debf88d6475f71e7e48a13e48947b6
tree628cc8e0d3a90a9979e2664db0f6571dae3195ed
parent84c5de89039e429fb82101d19cfdce4ecc6e5e33
parent02467ff4d454371fbcc656432b3657e7f75659f0
Merge branch 'hotfix/1.0.4'