Merge pull request #13635 from fbuihuu/no-aliases-with-enable

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

Mon, 28 Oct 2019 08:23:08 +0000 (09:23 +0100)

committer GitHub <noreply@github.com>

Mon, 28 Oct 2019 08:23:08 +0000 (09:23 +0100)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 28 Oct 2019 08:23:08 +0000 (09:23 +0100)
committer GitHub <noreply@github.com>
Mon, 28 Oct 2019 08:23:08 +0000 (09:23 +0100)
diff --cc man/systemd.unit.xml
Simple merge
diff --cc src/core/dbus-manager.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Mon, 28 Oct 2019 08:23:08 +0000 (09:23 +0100)
committer	GitHub <noreply@github.com>
	Mon, 28 Oct 2019 08:23:08 +0000 (09:23 +0100)
		1	2
man/systemd.unit.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/dbus-manager.c	patch \|	diff1 \|	diff2 \|	blob \| history