Merge branch 'hotfix/1.0.5' v1.0.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 25 Oct 2016 13:28:04 +0000 (09:28 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 25 Oct 2016 13:28:04 +0000 (09:28 -0400)
commit9d29c6b45588577b7aa96d680b023527ef26edf3
tree999776bc3229cb94cdd5eb3dea7eb5a4a3ace606
parentc5fb72eb7491917b2e4500ea0a80255eb3fbd260
parent25947f16e1e6cf559193e108df1d53a77b341077
Merge branch 'hotfix/1.0.5'