Merge pull request #8408 from keszybz/ln-relative

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

Mon, 19 Mar 2018 09:32:30 +0000 (18:32 +0900)

committer GitHub <noreply@github.com>

Mon, 19 Mar 2018 09:32:30 +0000 (18:32 +0900)
author Yu Watanabe <watanabe.yu+github@gmail.com>
Mon, 19 Mar 2018 09:32:30 +0000 (18:32 +0900)
committer GitHub <noreply@github.com>
Mon, 19 Mar 2018 09:32:30 +0000 (18:32 +0900)
diff --cc meson.build
Simple merge
diff --cc src/core/manager.c
Simple merge
author	Yu Watanabe <watanabe.yu+github@gmail.com>
	Mon, 19 Mar 2018 09:32:30 +0000 (18:32 +0900)
committer	GitHub <noreply@github.com>
	Mon, 19 Mar 2018 09:32:30 +0000 (18:32 +0900)
		1	2
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/manager.c	patch \|	diff1 \|	diff2 \|	blob \| history