Merge pull request #1247 from foreign-affairs/master

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

Mon, 19 Aug 2024 03:12:37 +0000 (22:12 -0500)

committer GitHub <noreply@github.com>

Mon, 19 Aug 2024 03:12:37 +0000 (22:12 -0500)
author gap579137 <30596626+gap579137@users.noreply.github.com>
Mon, 19 Aug 2024 03:12:37 +0000 (22:12 -0500)
committer GitHub <noreply@github.com>
Mon, 19 Aug 2024 03:12:37 +0000 (22:12 -0500)
diff --cc adguard/everything-ags.txt
Simple merge
diff --cc alt-version/everything-nl.txt
Simple merge
diff --cc dnsmasq-version/everything-dnsmasq.txt
Simple merge
diff --cc everything.txt
Simple merge
author	gap579137 <30596626+gap579137@users.noreply.github.com>
	Mon, 19 Aug 2024 03:12:37 +0000 (22:12 -0500)
committer	GitHub <noreply@github.com>
	Mon, 19 Aug 2024 03:12:37 +0000 (22:12 -0500)
		1	2
adguard/everything-ags.txt	patch \|	diff1 \|	diff2 \|	blob \| history
alt-version/everything-nl.txt	patch \|	diff1 \|	diff2 \|	blob \| history
dnsmasq-version/everything-dnsmasq.txt	patch \|	diff1 \|	diff2 \|	blob \| history
everything.txt	patch \|	diff1 \|	diff2 \|	blob \| history