Merge branch 'hotfix/1.0.2' 1.0.2
authorIan Weller <ian@gaslightmedia.com>
Thu, 8 Dec 2016 16:06:23 +0000 (11:06 -0500)
committerIan Weller <ian@gaslightmedia.com>
Thu, 8 Dec 2016 16:06:23 +0000 (11:06 -0500)
commite9e123c7b7c3b149c8be672248761b0ce4508092
tree01cdb5475756b8230308697ea258c339be98afe7
parentfb8c2eb0cbc0b9878792818081462776b069a4de
parentdadf4519242bdaa528e87effb1105384d6db023d
Merge branch 'hotfix/1.0.2'