Merge branch 'hotfix/1.0.4' master v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 6 Jun 2018 20:41:29 +0000 (16:41 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 6 Jun 2018 20:41:29 +0000 (16:41 -0400)
commit60f5430d8f4db5936cda7ad96c8957df10bcfa54
tree6f7c1bccf2242e0f9e5577c945b978594ff35077
parent68e24d34b11215c56ee3a047f43fa932d911a9f0
parent3795c89959ac83ec08c9e3b7ce54f287d52f6e3d
Merge branch 'hotfix/1.0.4'