Merge branch 'hotfix/1.1.39' v1.1.39
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 15 Feb 2018 17:43:35 +0000 (12:43 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 15 Feb 2018 17:43:35 +0000 (12:43 -0500)
commit6478464d02543c544b5ad7361822963637745a5f
treeb3305ce77912daa2bcfd4bf70dde883098656eee
parent13d2482831e26cd61339833cf8a0aa6d762a1b47
parenta68274a332f3db4175a4917511f5124c6d3c2968
Merge branch 'hotfix/1.1.39'