Merge pull request #33491 from keszybz/allow-interactive-auth-in-inhibit

author Luca Boccassi <bluca@debian.org>

Wed, 26 Jun 2024 21:01:22 +0000 (23:01 +0200)

committer GitHub <noreply@github.com>

Wed, 26 Jun 2024 21:01:22 +0000 (23:01 +0200)
author Luca Boccassi <bluca@debian.org>
Wed, 26 Jun 2024 21:01:22 +0000 (23:01 +0200)
committer GitHub <noreply@github.com>
Wed, 26 Jun 2024 21:01:22 +0000 (23:01 +0200)
diff --cc src/home/homectl.c
Simple merge
diff --cc src/shared/meson.build
Simple merge
author	Luca Boccassi <bluca@debian.org>
	Wed, 26 Jun 2024 21:01:22 +0000 (23:01 +0200)
committer	GitHub <noreply@github.com>
	Wed, 26 Jun 2024 21:01:22 +0000 (23:01 +0200)
		1	2
src/home/homectl.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared/meson.build	patch \|	diff1 \|	diff2 \|	blob \| history