Merge pull request #12508 from stangri/18.06-simple-adblock
authorEtienne Champetier <champetier.etienne@gmail.com>
Sat, 13 Jun 2020 22:11:18 +0000 (18:11 -0400)
committerGitHub <noreply@github.com>
Sat, 13 Jun 2020 22:11:18 +0000 (18:11 -0400)
commit4176f481484eac5d30f8c6a8d682f2bf49ad58d2
tree7ed156b4fbde521d6d534592a4cdd5f007223765
parent45709a62301a91c958c0c1ae71b2beeb502f861b
parent2ea2b371b3011741f8dee72fdc0be776aadc5615
Merge pull request #12508 from stangri/18.06-simple-adblock

[18.06] simple-adblock: racially-neutral names