Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Nov 2016 20:30:50 +0000 (16:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Nov 2016 20:30:50 +0000 (16:30 -0400)
commit77a209f1ef4df64b6e2b59bf3c0d2007d881fa30
tree9ea3e44552b3d32a47f37d02a7616e62eda206d8
parent4afa6c2c26acc0cbcea22b04ad36da10723dbf9b
parent9e27cc59305817b384e1508a7457c3664271e887
Merge branch 'hotfix/1.0.4'