Merge branch 'release/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 20:11:16 +0000 (15:11 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 20:11:16 +0000 (15:11 -0500)
commit3198d4298684e4c8ead5d8d9a936411845828d8e
treeb7ed329619e2218a900ca222b4c4540d6f05f673
parentcb96663e89a7645ce46f0303f831aa39d09f249e
parent5f55d4e9cdd59f85c25a9e3bd06c80a5de190d75
Merge branch 'release/1.0.4'