]> git.ipfire.org Git - thirdparty/blocklistproject/lists.git/commit
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)
commitd6ef03f814495dc0f137c6be114b62955dc471f6
treec8086836501ad9302d7f674b66ae22f69f45bf48
parentafabc25be8853487d6d108b472173304585286fd
parent01b5d61bec6154c826940181a196443e2b4bc015
Merge branch 'master' into issue423

# Conflicts:
# phishing.txt
phishing.txt