]> git.ipfire.org Git - thirdparty/blocklistproject/lists.git/commitdiff
projects / thirdparty / blocklistproject / lists.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: afabc25 01b5d61)
Merge branch 'master' into issue423 424/head
authorCharlie Fish <fishcharlie@me.com>
Sun, 25 Jul 2021 03:07:35 +0000 (21:07 -0600)
committerCharlie Fish <fishcharlie@me.com>
Sun, 25 Jul 2021 03:07:35 +0000 (21:07 -0600)
# Conflicts:
# phishing.txt

1  2 
phishing.txt patch | diff1 | diff2 | blob | history

diff --cc phishing.txt
Simple merge
Mirror of https://github.com/blocklistproject/Lists.git