Merge pull request #34593 from Werkov/deprecate-aux-scopes

author Lennart Poettering <lennart@poettering.net>

Wed, 9 Oct 2024 08:25:30 +0000 (10:25 +0200)

committer GitHub <noreply@github.com>

Wed, 9 Oct 2024 08:25:30 +0000 (10:25 +0200)
author Lennart Poettering <lennart@poettering.net>
Wed, 9 Oct 2024 08:25:30 +0000 (10:25 +0200)
committer GitHub <noreply@github.com>
Wed, 9 Oct 2024 08:25:30 +0000 (10:25 +0200)
diff --cc NEWS
Simple merge
diff --cc man/org.freedesktop.systemd1.xml
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Wed, 9 Oct 2024 08:25:30 +0000 (10:25 +0200)
committer	GitHub <noreply@github.com>
	Wed, 9 Oct 2024 08:25:30 +0000 (10:25 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
man/org.freedesktop.systemd1.xml	patch \|	diff1 \|	diff2 \|	blob \| history