Merge tag '1.0.4' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 20 Apr 2017 16:20:57 +0000 (12:20 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 20 Apr 2017 16:20:57 +0000 (12:20 -0400)
commit37abc6d706bdfc605051d22c9e9ff6bd76e6f318
treefefc7d1b642ffb9eae44a0df505590f815944246
parent9ca86bc5b767ab9697709e3fef6420afac7039da
parentd37effb4ae7719fba8d04aa456ada00e4879cda2
Merge tag '1.0.4' into develop

verison 1.0.4