Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 17 Jan 2018 13:02:47 +0000 (08:02 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 17 Jan 2018 13:02:47 +0000 (08:02 -0500)
commit56fc48d9919c6afad7d40c39f2365f85b7bc8d1c
tree08f8ad18b1b16a8a3e7cb412bbf05d1f3c0061cf
parentaa4f09344ca3e500d62d6f29c3bf305a27bf4161
parentbc6ce2e82859d06d717726b414b1e2956a44628a
Merge branch 'hotfix/1.0.4'