]> git.ipfire.org Git - thirdparty/blocklistproject/lists.git/commit
projects / thirdparty / blocklistproject / lists.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d58d89c 0103aac)
Merge branch 'master' into lintPreventCommentedDomainsFromReappearing 400/head
authorCharlie Fish <fishcharlie@me.com>
Thu, 15 Jul 2021 00:28:14 +0000 (18:28 -0600)
committerCharlie Fish <fishcharlie@me.com>
Thu, 15 Jul 2021 00:28:14 +0000 (18:28 -0600)
commitb530f3a5dd3eeeffb7d2fa8ff0f0ee4512c76c35
treeaf099fac84cce516c3cd1a353a5bc46d9bfab019tree | snapshot
parentd58d89c6fa0216cd015cb4473e16771247de60e0commit | diff
parent0103aaca913084ef6b913ccff47afc1c8c8ff8f0commit | diff
Merge branch 'master' into lintPreventCommentedDomainsFromReappearing

# Conflicts:
# everything.txt
# porn.txt
ads.txt diff1 | diff2 | blob | history
everything.txt diff1 | diff2 | blob | history
porn.txt diff1 | diff2 | blob | history
Mirror of https://github.com/blocklistproject/Lists.git