Merge branch 'hotfix/1.0.12' v1.0.12
authorIan Weller <ian@gaslightmedia.com>
Wed, 21 Jun 2017 20:17:02 +0000 (16:17 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 21 Jun 2017 20:17:02 +0000 (16:17 -0400)
commit42ed72887461d58a8f7cff6d449830d46526f3fe
treec8296581f416f6075682e5956c144b6f38345bc9
parent7f2c53cd485d35b5615c6716c77a56d0c65f61a4
parent91b293f1125dd810b5c1282d3acf401d6a9a3963
Merge branch 'hotfix/1.0.12'