Merge branch 'hotfix/1.0.1' v1.0.1
authorLaury GvR <laury@gaslightmedia.com>
Thu, 13 Aug 2015 16:19:53 +0000 (12:19 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 13 Aug 2015 16:19:53 +0000 (12:19 -0400)
commita5a4ee40acba3be1eeb8223fbf197402f977034b
tree0b32f06e9b7852cc00daacb6c9e45b6625b34e45
parent48d018cc389393204bdf2bfd0d88889003892069
parent045670687169cae0548e9a0ae12947e7a3e7f1b1
Merge branch 'hotfix/1.0.1'