Merge pull request #6480 from ajaffie/feature/win-check-update-4720

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

Tue, 13 Nov 2018 15:40:26 +0000 (16:40 +0100)

committer GitHub <noreply@github.com>

Tue, 13 Nov 2018 15:40:26 +0000 (16:40 +0100)
author Michael Friedrich <michael.friedrich@icinga.com>
Tue, 13 Nov 2018 15:40:26 +0000 (16:40 +0100)
committer GitHub <noreply@github.com>
Tue, 13 Nov 2018 15:40:26 +0000 (16:40 +0100)
diff --cc doc/10-icinga-template-library.md
Simple merge
diff --cc itl/command-plugins-windows.conf
Simple merge
diff --cc plugins/check_update.cpp
Simple merge
author	Michael Friedrich <michael.friedrich@icinga.com>
	Tue, 13 Nov 2018 15:40:26 +0000 (16:40 +0100)
committer	GitHub <noreply@github.com>
	Tue, 13 Nov 2018 15:40:26 +0000 (16:40 +0100)
		1	2
doc/10-icinga-template-library.md	patch \|	diff1 \|	diff2 \|	blob \| history
itl/command-plugins-windows.conf	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/check_update.cpp	patch \|	diff1 \|	diff2 \|	blob \| history