Merge pull request #5314 from MrPetovan/task/4889-fix-tests

author Michael Vogel <icarus@dabo.de>

Fri, 6 Jul 2018 20:14:01 +0000 (22:14 +0200)

committer GitHub <noreply@github.com>

Fri, 6 Jul 2018 20:14:01 +0000 (22:14 +0200)
author Michael Vogel <icarus@dabo.de>
Fri, 6 Jul 2018 20:14:01 +0000 (22:14 +0200)
committer GitHub <noreply@github.com>
Fri, 6 Jul 2018 20:14:01 +0000 (22:14 +0200)
diff --cc boot.php
Simple merge
diff --cc src/Database/DBStructure.php
Simple merge
diff --cc src/Model/Item.php
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Fri, 6 Jul 2018 20:14:01 +0000 (22:14 +0200)
committer	GitHub <noreply@github.com>
	Fri, 6 Jul 2018 20:14:01 +0000 (22:14 +0200)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Database/DBStructure.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Model/Item.php	patch \|	diff1 \|	diff2 \|	blob \| history