Merge branch 'hotfix/1.0.18' v1.0.18
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 27 Jul 2018 12:12:40 +0000 (08:12 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 27 Jul 2018 12:12:40 +0000 (08:12 -0400)
commit4bd38ca578f8f1cf6c93f34dd48ea2d70a672826
treeab0172df00bcd61d51f1aedd521879358c20aba9
parenta10efc8b2838c04e33d809c6578b92591f5acdc5
parentd3e3d0827ad18ad095783f5b6686b797a6b80baa
Merge branch 'hotfix/1.0.18'