Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 20 Jan 2017 15:38:13 +0000 (10:38 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 20 Jan 2017 15:38:13 +0000 (10:38 -0500)
commit37ce8338aceaa33ee9913375f76d6fa9c6dfe777
tree57f798984eab2458891e627eaf0905559b85aa96
parent23caa1afd53074c4f7a8e2216ce8478fe5e8a514
parent162da8f6d85783a51cc6eec233a2f9dc58aa4dac
Merge branch 'hotfix/1.0.4'