Merge branch 'hotfix/1.0.40' v1.0.40
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 5 Jul 2017 12:47:36 +0000 (08:47 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 5 Jul 2017 12:47:36 +0000 (08:47 -0400)
commit20e0a33f5f78cb1e86a4e304e2fae400fbd1f474
tree490b9d516f3f4de9f3fb572d4b47b5aed36c3747
parentd4d6a1feec0819ca1c34a0fa23b3b49e21a77763
parenta43b5e6a8b7f5d7a34cf758e64b48f1aee400704
Merge branch 'hotfix/1.0.40'