Merge branch 'hotfix/1.0.4' 1.0.4
authorIan Weller <ian@gaslightmedia.com>
Thu, 20 Apr 2017 16:20:20 +0000 (12:20 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 20 Apr 2017 16:20:20 +0000 (12:20 -0400)
commitd37effb4ae7719fba8d04aa456ada00e4879cda2
treefefc7d1b642ffb9eae44a0df505590f815944246
parentf3e6e3b0c69815c99778f15341114fe42a5db128
parent44b0ff348b1d2694841a4828a6d56ec3ffb3ca5f
Merge branch 'hotfix/1.0.4'