Merge pull request #17297 from keszybz/tmpfiles-sysusers-disable-standalone-image

author Michael Biebl <mbiebl@gmail.com>

Tue, 20 Oct 2020 21:07:16 +0000 (23:07 +0200)

committer GitHub <noreply@github.com>

Tue, 20 Oct 2020 21:07:16 +0000 (23:07 +0200)
author Michael Biebl <mbiebl@gmail.com>
Tue, 20 Oct 2020 21:07:16 +0000 (23:07 +0200)
committer GitHub <noreply@github.com>
Tue, 20 Oct 2020 21:07:16 +0000 (23:07 +0200)
diff --cc meson.build
Simple merge
diff --cc src/tmpfiles/tmpfiles.c
Simple merge
author	Michael Biebl <mbiebl@gmail.com>
	Tue, 20 Oct 2020 21:07:16 +0000 (23:07 +0200)
committer	GitHub <noreply@github.com>
	Tue, 20 Oct 2020 21:07:16 +0000 (23:07 +0200)
		1	2
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
src/tmpfiles/tmpfiles.c	patch \|	diff1 \|	diff2 \|	blob \| history