Merge pull request #3366 from DaanDeMeyer/keyring

author Daan De Meyer <daan.j.demeyer@gmail.com>

Thu, 16 Jan 2025 09:28:07 +0000 (10:28 +0100)

committer GitHub <noreply@github.com>

Thu, 16 Jan 2025 09:28:07 +0000 (10:28 +0100)
author Daan De Meyer <daan.j.demeyer@gmail.com>
Thu, 16 Jan 2025 09:28:07 +0000 (10:28 +0100)
committer GitHub <noreply@github.com>
Thu, 16 Jan 2025 09:28:07 +0000 (10:28 +0100)
diff --cc mkosi/__init__.py
Simple merge
diff --cc mkosi/config.py
Simple merge
diff --cc mkosi/resources/man/mkosi.1.md
Simple merge
author	Daan De Meyer <daan.j.demeyer@gmail.com>
	Thu, 16 Jan 2025 09:28:07 +0000 (10:28 +0100)
committer	GitHub <noreply@github.com>
	Thu, 16 Jan 2025 09:28:07 +0000 (10:28 +0100)
		1	2
mkosi/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history
mkosi/config.py	patch \|	diff1 \|	diff2 \|	blob \| history
mkosi/resources/man/mkosi.1.md	patch \|	diff1 \|	diff2 \|	blob \| history