]> 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: a14f73b 60b5d2d)
Merge pull request #440 from spirillen/spirillen-patch-438
authorThe Block List Project <66567751+blocklistproject@users.noreply.github.com>
Tue, 10 Aug 2021 18:01:22 +0000 (13:01 -0500)
committerGitHub <noreply@github.com>
Tue, 10 Aug 2021 18:01:22 +0000 (13:01 -0500)
1  2 
ads.txt patch | diff1 | diff2 | blob | history
malware.txt patch | diff1 | diff2 | blob | history
porn.txt patch | diff1 | diff2 | blob | history

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