Merge branch 'hotfix/1.0.4' v1.0.4
authorIan Weller <ian@gaslightmedia.com>
Tue, 13 Dec 2016 17:39:10 +0000 (12:39 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 13 Dec 2016 17:39:10 +0000 (12:39 -0500)
commit273d6991d8b284481e406e2614198366dbab7a48
tree6aa1f41e87c288aa6fec851c4dff9f0697c4bc53
parentd0a0114f0ad7eb27b9989e353c191563e9a1372a
parent49a45f29afbd6232136a48bd70ee45393dd4c53b
Merge branch 'hotfix/1.0.4'