Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 8 May 2017 15:06:03 +0000 (11:06 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 8 May 2017 15:06:03 +0000 (11:06 -0400)
commit44028afb740218555d1c63160504eb68f7b6c837
tree1fd7216d661ec0041ee4998243aa3f66334e55e7
parentb376d1bd6c4ab8b31f1af2b6b52e7182ae432076
parent36fc6f86f4ff115d4ac9d43c6eabd1948b3c2582
Merge branch 'hotfix/1.0.4'