Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 20 Apr 2017 16:00:25 +0000 (12:00 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 20 Apr 2017 16:00:25 +0000 (12:00 -0400)
commit9a666cf5418a19a2bc1e9577588a413ddae80128
tree109f354bd96837c02cfa525ff6c652210db00371
parentbd520d70c8f09fc3def6b134902e69e4758d89c7
parent894eb6649cc0228100ce0c25df79a46257f212ab
Merge branch 'hotfix/1.0.4'