Merge branch 'hotfix/1.1.0' v1.1.0
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 28 Jul 2017 18:53:33 +0000 (14:53 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 28 Jul 2017 18:53:33 +0000 (14:53 -0400)
commit672fbd4f9e0b61f6080704938d85dc30b73797bb
treef869e7df668fba8e63646c054946ec27b3f1f07d
parentc0770204e5494d988955182a159c0f8b5d2379c6
parent17d83e8ed439ab1341ce8e591c70f7fc2f7508c7
Merge branch 'hotfix/1.1.0'