Merge pull request #14003 from keszybz/user-path-configurable

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

Thu, 14 Nov 2019 09:08:40 +0000 (10:08 +0100)

committer GitHub <noreply@github.com>

Thu, 14 Nov 2019 09:08:40 +0000 (10:08 +0100)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 14 Nov 2019 09:08:40 +0000 (10:08 +0100)
committer GitHub <noreply@github.com>
Thu, 14 Nov 2019 09:08:40 +0000 (10:08 +0100)
diff --cc man/systemd.exec.xml
Simple merge
diff --cc meson.build
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Thu, 14 Nov 2019 09:08:40 +0000 (10:08 +0100)
committer	GitHub <noreply@github.com>
	Thu, 14 Nov 2019 09:08:40 +0000 (10:08 +0100)
		1	2
man/systemd.exec.xml	patch \|	diff1 \|	diff2 \|	blob \| history
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history