Merge branch 'hotfix/1.0.2' master v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 21 Jun 2018 15:28:46 +0000 (11:28 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 21 Jun 2018 15:28:46 +0000 (11:28 -0400)
commitc18ddd001021e64ede5cb811a7e1ecf2eb21cf2f
tree1ccd469f77a4e7a5ca1a7a8af0bf82c102af37f2
parent2b482bd9fed790c1ecf3af2b003a1144db169c8d
parent19e2e0d00c3eaa5a27359439062ab576721ebe4e
Merge branch 'hotfix/1.0.2'