Merge pull request #7073 from Icinga/feature/docs-development-macos-windows

author Michael Friedrich <michael.friedrich@icinga.com>

Tue, 9 Apr 2019 12:16:39 +0000 (14:16 +0200)

committer GitHub <noreply@github.com>

Tue, 9 Apr 2019 12:16:39 +0000 (14:16 +0200)
author Michael Friedrich <michael.friedrich@icinga.com>
Tue, 9 Apr 2019 12:16:39 +0000 (14:16 +0200)
committer GitHub <noreply@github.com>
Tue, 9 Apr 2019 12:16:39 +0000 (14:16 +0200)
diff --cc doc/15-troubleshooting.md
Simple merge
diff --cc doc/16-upgrading-icinga-2.md
Simple merge
diff --cc doc/19-technical-concepts.md
Simple merge
author	Michael Friedrich <michael.friedrich@icinga.com>
	Tue, 9 Apr 2019 12:16:39 +0000 (14:16 +0200)
committer	GitHub <noreply@github.com>
	Tue, 9 Apr 2019 12:16:39 +0000 (14:16 +0200)
		1	2
doc/15-troubleshooting.md	patch \|	diff1 \|	diff2 \|	blob \| history
doc/16-upgrading-icinga-2.md	patch \|	diff1 \|	diff2 \|	blob \| history
doc/19-technical-concepts.md	patch \|	diff1 \|	diff2 \|	blob \| history