From: Charlie Fish Date: Thu, 15 Jul 2021 00:28:14 +0000 (-0600) Subject: Merge branch 'master' into lintPreventCommentedDomainsFromReappearing X-Git-Tag: aggregated-20250518~446^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F400%2Fhead;p=thirdparty%2Fblocklistproject%2Flists.git Merge branch 'master' into lintPreventCommentedDomainsFromReappearing # Conflicts: # everything.txt # porn.txt --- b530f3a5dd3eeeffb7d2fa8ff0f0ee4512c76c35 diff --cc everything.txt index a5d610e,995cf6b..ec182f7 --- a/everything.txt +++ b/everything.txt @@@ -4,8 -4,8 +4,8 @@@ # Homepage: https://blocklist.site # Help: https://github.com/blocklistproject/lists/wiki/ # License: https://unlicense.org - # Total number of network filters: 3064001 + # Total number of network filters: 3064006 -#------------------------------------[SUPPORT]------------------------------------- +# ------------------------------------[SUPPORT]------------------------------------- # You can support by: # - reporting false positives # - making a donation: https://paypal.me/blocklistproject diff --cc porn.txt index ddf5883,a0412f4..c809ec2 --- a/porn.txt +++ b/porn.txt @@@ -4,8 -4,8 +4,8 @@@ # Homepage: https://blocklist.site # Help: https://github.com/blocklistproject/lists/wiki/ # License: https://unlicense.org - # Total number of network filters: 1907389 + # Total number of network filters: 1907393 -#------------------------------------[SUPPORT]------------------------------------- +# ------------------------------------[SUPPORT]------------------------------------- # You can support by: # - reporting false positives # - making a donation: https://paypal.me/blocklistproject @@@ -1907406,3 -1907406,7 +1907406,7 @@@ 0.0.0.0 www.menofuk.com 0.0.0.0 www.boyfriendtv.com 0.0.0.0 tgp.blackmaleme.com + 0.0.0.0 www.54647.website + 0.0.0.0 54647.website + 0.0.0.0 54647.io -0.0.0.0 www.54647.io ++0.0.0.0 www.54647.io