Merge branch 'hotfix/1.2.36' v1.2.36
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 9 Feb 2018 20:44:41 +0000 (15:44 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 9 Feb 2018 20:44:41 +0000 (15:44 -0500)
commit40f17c1cee5acee7f09fa2452509289b92e2b517
tree00d1c3fa33cd57d973c63f928861b9a1be28ba4d
parent49c9a5b8370fe257168ce43c84c4209b2c8d12c4
parent05779ad19b16c06ad25b644a9e017b9b8ecf238c
Merge branch 'hotfix/1.2.36'