Merge branch 'hotfix/1.0.5' v1.0.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 20 Jan 2017 15:46:04 +0000 (10:46 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 20 Jan 2017 15:46:04 +0000 (10:46 -0500)
commit7fad1092fcd95e9f888c2cdc0ad810a5f94063e9
treeabeea1f5e2056687b91ca07338547575114fe64a
parent37ce8338aceaa33ee9913375f76d6fa9c6dfe777
parent4819d5323dc927b443666bfa003235c39d037726
Merge branch 'hotfix/1.0.5'