Merge branch 'hotfix/1.0.18' v1.0.18
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 16 Mar 2018 20:29:41 +0000 (16:29 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 16 Mar 2018 20:29:41 +0000 (16:29 -0400)
commitbc92d57a13b373b85f3965f3f09e879dafb99f72
treea0e1d9b33e5036f5e26300e70ba8ef0b7cfb7988
parent8c0cab3ac3076693095a37f98ea71a92b84eab6a
parente28d3027f19e537f44e2795dfe984dd145675ee9
Merge branch 'hotfix/1.0.18'