Merge pull request #4166 from MrPetovan/task/fix-scrutinizer-issues

author Michael Vogel <icarus@dabo.de>

Thu, 4 Jan 2018 19:59:07 +0000 (20:59 +0100)

committer GitHub <noreply@github.com>

Thu, 4 Jan 2018 19:59:07 +0000 (20:59 +0100)
author Michael Vogel <icarus@dabo.de>
Thu, 4 Jan 2018 19:59:07 +0000 (20:59 +0100)
committer GitHub <noreply@github.com>
Thu, 4 Jan 2018 19:59:07 +0000 (20:59 +0100)
diff --cc doc/htconfig.md
Simple merge
diff --cc include/items.php
Simple merge
diff --cc include/network.php
Simple merge
diff --cc include/plaintext.php
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Thu, 4 Jan 2018 19:59:07 +0000 (20:59 +0100)
committer	GitHub <noreply@github.com>
	Thu, 4 Jan 2018 19:59:07 +0000 (20:59 +0100)
		1	2
doc/htconfig.md	patch \|	diff1 \|	diff2 \|	blob \| history
include/items.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/network.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/plaintext.php	patch \|	diff1 \|	diff2 \|	blob \| history