Merge branch 'hotfix/2.1.2' v2.1.2
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Jul 2017 12:44:35 +0000 (08:44 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Jul 2017 12:44:35 +0000 (08:44 -0400)
commit876a170be83ded0b1bec3595af02a2034203439c
treef0019614bf0fd75be0b0d12f5cf1d499926f6ab1
parenta778d475c6bff63adfdf0d68bf72f584ac5f7242
parent68b41f1530dd7e93050e5afc6c0eb375bd92a396
Merge branch 'hotfix/2.1.2'