Merge branch 'hotfix/1.2.15' v1.2.15
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 17 Nov 2017 19:08:43 +0000 (14:08 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 17 Nov 2017 19:08:43 +0000 (14:08 -0500)
commit530759289d0c28095a8bc176ca1737d36f468094
tree1f7c6809a1721111d0a2a34816cddbbf42f0b45b
parentabfdfc015b2f40b3f393928ef7603525a2bc2cc8
parente97e7a1281708aa5165d1eefbc4a5fd4fb346426
Merge branch 'hotfix/1.2.15'