]> git.ipfire.org Git - thirdparty/blocklistproject/lists.git/commit
Merge branch 'master' into lint 370/head
authorCharlie Fish <fishcharlie@me.com>
Wed, 7 Jul 2021 21:11:53 +0000 (15:11 -0600)
committerCharlie Fish <fishcharlie@me.com>
Wed, 7 Jul 2021 21:11:53 +0000 (15:11 -0600)
commit2c2e104083b97e96ce36365173fafdb4b1646a86
treec19b4901feb0c150144e38bbc08164ab890b2f03
parent77483dc8dae933fc9716d1757db91437b95050cf
parent7b46028a87bdf432e9386aa419c3363846063064
Merge branch 'master' into lint

# Conflicts:
# malware.txt
# scam.txt
abuse.txt
malware.txt
scam.txt