Merge branch 'hotfix/1.2.12' v1.2.12
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 3 Oct 2016 12:32:18 +0000 (08:32 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 3 Oct 2016 12:32:18 +0000 (08:32 -0400)
commit94ecc5c6b98ccd85c423e03427fb984a515c68dc
tree39dd55762579ee94f5f70c3e1830de47fd78702d
parentc16d2df2d5168be2e99658bf2e7ff6d109c06cee
parent2cac71780b79bd00c597f209c3182b21fe574940
Merge branch 'hotfix/1.2.12'