Merge branch 'hotfix/1.5.29' master v1.5.29
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Mar 2018 15:03:29 +0000 (10:03 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Mar 2018 15:03:29 +0000 (10:03 -0500)
commitbc179396acd60d1f808db60b41258e6cd82402ed
tree8f930efc96e24499a17284345e069bcfd8424356
parent11c2c362c9c3e24dddfd50dd52d454f1f558dc3d
parent7ba4e3d2d1861368d53a3995dc4e4157f7421b1d
Merge branch 'hotfix/1.5.29'