Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Nov 2016 16:11:21 +0000 (12:11 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Nov 2016 16:11:21 +0000 (12:11 -0400)
commitcb06181dba53f4055524e0c8aa7de913bb6da70f
treeed6a5a3b0cb544dc740f04e071604e54f1c32603
parenteb9690c30f12be444c802a4e164756fe148c48d7
parente3fb7d925d98978a4346611c0d66cac08d95ed10
Merge branch 'hotfix/1.0.4'