Merge branch 'hotfix/1.0.2' v1.0.2
authorIan Weller <ian@gaslightmedia.com>
Tue, 20 Sep 2016 15:21:09 +0000 (11:21 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 20 Sep 2016 15:21:09 +0000 (11:21 -0400)
commit01e350b51d9b6cbf4b52e53c2bd07d14c84eb1a3
tree15fcce514443c312714f7bfbebbda19fd1f6f517
parent1ac0f645ee17b8fb62029b3bb54934c53dcbf25f
parent732fad0827c86873b657b2f8aadf0f21637596aa
Merge branch 'hotfix/1.0.2'