Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Thu, 28 Apr 2016 13:45:25 +0000 (09:45 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 28 Apr 2016 13:45:25 +0000 (09:45 -0400)
commit80b12e5afc82b43579600ce95571a2608674685c
tree49ac77bbabc8c6eeecc34f971143be28daff9b49
parent273b5174cc4df71d2d2b609b79bc4f1a2a7740ab
parent581c010e8b8bcc4fb9366e0fc93da64deb5c6b2f
Merge branch 'hotfix/1.0.4'