Merge pull request #15217 from keszybz/beef-up-sd-path

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

Sun, 29 Mar 2020 20:57:53 +0000 (22:57 +0200)

committer GitHub <noreply@github.com>

Sun, 29 Mar 2020 20:57:53 +0000 (22:57 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sun, 29 Mar 2020 20:57:53 +0000 (22:57 +0200)
committer GitHub <noreply@github.com>
Sun, 29 Mar 2020 20:57:53 +0000 (22:57 +0200)
diff --cc man/rules/meson.build
Simple merge
diff --cc src/network/networkd-manager.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Sun, 29 Mar 2020 20:57:53 +0000 (22:57 +0200)
committer	GitHub <noreply@github.com>
	Sun, 29 Mar 2020 20:57:53 +0000 (22:57 +0200)
		1	2
man/rules/meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
src/network/networkd-manager.c	patch \|	diff1 \|	diff2 \|	blob \| history