Merge pull request #14208 from poettering/json-homed-prepare

author Yu Watanabe <watanabe.yu+github@gmail.com>

Tue, 17 Dec 2019 14:10:08 +0000 (23:10 +0900)

committer GitHub <noreply@github.com>

Tue, 17 Dec 2019 14:10:08 +0000 (23:10 +0900)
author Yu Watanabe <watanabe.yu+github@gmail.com>
Tue, 17 Dec 2019 14:10:08 +0000 (23:10 +0900)
committer GitHub <noreply@github.com>
Tue, 17 Dec 2019 14:10:08 +0000 (23:10 +0900)
diff --cc src/network/netdev/macsec.c
Simple merge
diff --cc src/network/netdev/wireguard.c
Simple merge
author	Yu Watanabe <watanabe.yu+github@gmail.com>
	Tue, 17 Dec 2019 14:10:08 +0000 (23:10 +0900)
committer	GitHub <noreply@github.com>
	Tue, 17 Dec 2019 14:10:08 +0000 (23:10 +0900)
		1	2
src/network/netdev/macsec.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/network/netdev/wireguard.c	patch \|	diff1 \|	diff2 \|	blob \| history