Merge pull request #15520 from mrc0mmand/various-codebase-improvements

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

Wed, 22 Apr 2020 06:41:38 +0000 (08:41 +0200)

committer GitHub <noreply@github.com>

Wed, 22 Apr 2020 06:41:38 +0000 (08:41 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 22 Apr 2020 06:41:38 +0000 (08:41 +0200)
committer GitHub <noreply@github.com>
Wed, 22 Apr 2020 06:41:38 +0000 (08:41 +0200)
diff --cc TODO
Simple merge
diff --cc man/systemd.network.xml
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Wed, 22 Apr 2020 06:41:38 +0000 (08:41 +0200)
committer	GitHub <noreply@github.com>
	Wed, 22 Apr 2020 06:41:38 +0000 (08:41 +0200)
		1	2
TODO	patch \|	diff1 \|	diff2 \|	blob \| history
man/systemd.network.xml	patch \|	diff1 \|	diff2 \|	blob \| history