]> git.ipfire.org Git - thirdparty/blocklistproject/lists.git/commit
Merge branch 'master' of github.com:blocklistproject/Lists
authorCharlie Fish <fishcharlie@me.com>
Mon, 17 Jan 2022 00:07:41 +0000 (17:07 -0700)
committerCharlie Fish <fishcharlie@me.com>
Mon, 17 Jan 2022 00:07:41 +0000 (17:07 -0700)
commitfb5d0b0c9dd21a01b8ca6aecb308d7d22d11534e
treedcd81c35e50cfa934a59837bf6aa539e5fb9902d
parent25bcef52f715216bef43fcd768e81ba04716597e
parent9789a9d190637911cf94f2750e96a8a9c2871d36
Merge branch 'master' of github.com:blocklistproject/Lists

# Conflicts:
# phishing.txt
# twitter.txt
phishing.txt