Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Dec 2016 17:42:10 +0000 (12:42 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Dec 2016 17:42:10 +0000 (12:42 -0500)
commit5ab38731463e9de15ba1aa9d615d6c6c7bf49002
treea0db38c301e366f0df4085b379000364aeb399eb
parent3f6f8b3fa83ecb4c8ef3f7f56ec865d4f22c47e1
parent049e2b55673bd66d93b214886ebfa2c39633581c
Merge branch 'hotfix/1.0.2'