Merge branch 'hotfix/1.0.5' v1.0.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 21 Apr 2017 12:13:24 +0000 (08:13 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 21 Apr 2017 12:13:24 +0000 (08:13 -0400)
commitf7497028aa2f3bd5f17c29a932fc520760fe6bb7
tree261fdaa33cad3b001d069d7ce1b1d27bd80728af
parentd37effb4ae7719fba8d04aa456ada00e4879cda2
parent161133a3f3e0cb4cf06de30e9b0ec5a7e874d93a
Merge branch 'hotfix/1.0.5'