]> git.ipfire.org Git - thirdparty/blocklistproject/lists.git/commitdiff
Merge branch 'master' into addingPhishingLink
authorCharlie Fish <fishcharlie@me.com>
Sat, 27 Nov 2021 23:28:57 +0000 (16:28 -0700)
committerCharlie Fish <fishcharlie@me.com>
Sat, 27 Nov 2021 23:28:57 +0000 (16:28 -0700)
# Conflicts:
# phishing.txt

1  2 
phishing.txt

diff --cc phishing.txt
index 917affb20da6041eaa8bdb192d3a624ee3a49dd6,0b2a0e696c82c4b9c6371a4217b947bad040c020..f048c22551340bc34f347073a4edb65f6feccf85
  0.0.0.0 discorcl.link
  0.0.0.0 discrodnitro.org
  0.0.0.0 stearncornmunity.ru.com
 -0.0.0.0 accessfreevpn.com
+ 0.0.0.0 ozzon-mobi-age.com
+ 0.0.0.0 disneyplusfreetrial.com
++0.0.0.0 accessfreevpn.com
 +0.0.0.0 4wsko.r.a.d.sendibm1.com