Merge branch 'hotfix/1.0.2' v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 31 May 2017 16:07:20 +0000 (12:07 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 31 May 2017 16:07:20 +0000 (12:07 -0400)
commit5ca497b693097fe23b534e91c05400cdb9666549
tree2542730b89cd723cc2f86da4e9e13c998dc00d80
parentf204d6496067c78e50547d3ae1c5739924f2a467
parent69485d9f6bf09c8717f104f381314c7fb8b93170
Merge branch 'hotfix/1.0.2'