Merge branch 'hotfix/1.0.1' master v1.0.1
authorLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 20:04:07 +0000 (16:04 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 20:04:07 +0000 (16:04 -0400)
commitc22ce08c878b558568bd58fa6abb8b284489f5ca
tree8f737f3c8b606e2f5295af4593389ce6c7e6d80d
parent0a97ae6e7ce27e3c1973b8aecd5e99a652ffc35f
parentee0ce38b9a2ead5783b6428504bbe2c8e2b0b39f
Merge branch 'hotfix/1.0.1'