Merge branch 'hotfix/1.0.5' v1.0.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 May 2016 19:33:38 +0000 (15:33 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 May 2016 19:33:38 +0000 (15:33 -0400)
commit33b10a36fbaabd890feb5f80c648bdd0bbe236e0
tree9f4f7b75cf846ce9a75a4f8bf11f6fa4b32c36cd
parent33d6288df151d23bbb09ca00aceb2c946ba9e978
parent935687fb8daeefb807461cf078713848ca1843f3
Merge branch 'hotfix/1.0.5'