Merge pull request #15718 from poettering/tmpfiles-offline

author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Fri, 8 May 2020 09:22:19 +0000 (11:22 +0200)

committer GitHub <noreply@github.com>

Fri, 8 May 2020 09:22:19 +0000 (11:22 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 8 May 2020 09:22:19 +0000 (11:22 +0200)
committer GitHub <noreply@github.com>
Fri, 8 May 2020 09:22:19 +0000 (11:22 +0200)
diff --cc meson.build
Simple merge
diff --cc src/sysusers/sysusers.c
Simple merge
diff --cc src/tmpfiles/tmpfiles.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Fri, 8 May 2020 09:22:19 +0000 (11:22 +0200)
committer	GitHub <noreply@github.com>
	Fri, 8 May 2020 09:22:19 +0000 (11:22 +0200)
		1	2
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
src/sysusers/sysusers.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/tmpfiles/tmpfiles.c	patch \|	diff1 \|	diff2 \|	blob \| history