Merge branch 'hotfix/1.2.35' v1.2.35
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 9 Feb 2018 16:06:11 +0000 (11:06 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 9 Feb 2018 16:06:11 +0000 (11:06 -0500)
commit49c9a5b8370fe257168ce43c84c4209b2c8d12c4
tree1a42bc6050c6cddea03a8d59d457d649e5e037de
parentbb23408d220e1b0e60418a269d5d8c2ce5c8b711
parent01de45937a852b432c60606edd57a216cee2d1aa
Merge branch 'hotfix/1.2.35'