Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 18:22:33 +0000 (13:22 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 18:22:33 +0000 (13:22 -0500)
commit52586f3d6da4a0a38470faaa21ad9a4c84af95d9
treeaf7e207d10dfbff65ddafa9bf3ae91349051c5d9
parentcc700ba2bd21ddd824cedd0e7d9469dbd05d995b
parent582e5a78cfe8745a224e75805e398e156e277b2a
Merge branch 'hotfix/1.0.2'