]> git.ipfire.org Git - thirdparty/blocklistproject/lists.git/commit
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)
commit0a04cb461f296c2213060efc6024a69ecb1f7bbd
treed66bc6586b4bce3a49c1ce9d3b4f824c0ae5a9b9
parentaf34cf639d8e731414b8ac451b6817259bdcd814
parent367d85ca7dd2664d759e4978367b40779dcb02f1
Merge branch 'master' into addingPhishingLink

# Conflicts:
# phishing.txt
phishing.txt