Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 31 Oct 2016 14:55:46 +0000 (10:55 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 31 Oct 2016 14:55:46 +0000 (10:55 -0400)
commit68af1e730516de93ea0fe61a3c762bfe089892a4
tree32d1e3a65d9787143daaa54eedc585cd2b9a130a
parent0a5affed68a571772cc92a4ecca47ef3192f4f08
parente0222ab9e8bef8082a8696d1abfd462556fc664c
Merge branch 'hotfix/1.0.4'