Merge branch 'hotfix/1.1.42' v1.1.42
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 22 Mar 2018 20:29:27 +0000 (16:29 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 22 Mar 2018 20:29:27 +0000 (16:29 -0400)
commit40c29bf00d0064300a0a3ec8767002beba9d95e7
tree0da839e348963d3eb85aec5aa8b3ae00ae17e8cb
parentc1aad55dd3e81b2484ce5d64851b1d81c1be18f3
parent649b7332d8211f43d7af26c9c97f186888553483
Merge branch 'hotfix/1.1.42'