Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 May 2016 19:08:35 +0000 (15:08 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 May 2016 19:08:35 +0000 (15:08 -0400)
commit33d6288df151d23bbb09ca00aceb2c946ba9e978
tree164ede68a1e3ba7b45fb056d9d53a22079b30568
parentfd18aba51db3a25fc35f2ba057a5f5f918df65a8
parent1d2c5899eae937699961d2952c7a6b7f79525a35
Merge branch 'hotfix/1.0.4'