Merge branch 'master' of https://github.com/blocklistproject/Lists

author gap579137 <30596626+gap579137@users.noreply.github.com>

Thu, 11 Feb 2021 19:29:58 +0000 (13:29 -0600)

committer gap579137 <30596626+gap579137@users.noreply.github.com>

Thu, 11 Feb 2021 19:29:58 +0000 (13:29 -0600)
author gap579137 <30596626+gap579137@users.noreply.github.com>
Thu, 11 Feb 2021 19:29:58 +0000 (13:29 -0600)
committer gap579137 <30596626+gap579137@users.noreply.github.com>
Thu, 11 Feb 2021 19:29:58 +0000 (13:29 -0600)
diff --cc abuse.txt
Simple merge
diff --cc alt-version/abuse-nl.txt
Simple merge
diff --cc alt-version/malware-nl.txt
Simple merge
diff --cc malware.txt
Simple merge
author	gap579137 <30596626+gap579137@users.noreply.github.com>
	Thu, 11 Feb 2021 19:29:58 +0000 (13:29 -0600)
committer	gap579137 <30596626+gap579137@users.noreply.github.com>
	Thu, 11 Feb 2021 19:29:58 +0000 (13:29 -0600)
		1	2
abuse.txt	patch \|	diff1 \|	diff2 \|	blob \| history
alt-version/abuse-nl.txt	patch \|	diff1 \|	diff2 \|	blob \| history
alt-version/malware-nl.txt	patch \|	diff1 \|	diff2 \|	blob \| history
malware.txt	patch \|	diff1 \|	diff2 \|	blob \| history