Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 10 Aug 2017 20:16:04 +0000 (16:16 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 10 Aug 2017 20:16:04 +0000 (16:16 -0400)
commita6ae0332e04598df63e5eca0edc2044d0df82da6
treece278913523ad0be60ad255b2a737d0cba25050b
parent2b14dff7b61479a3c449dfee56f17d6f0705001a
parentba303baa0001dcf3068d3944e8b98b23c62fd40f
Merge branch 'hotfix/1.0.4'