Merge pull request #8163 from MrPetovan/task/7817-custom-fields-part-3

author Philipp <admin+Github@philipp.info>

Fri, 31 Jan 2020 21:39:11 +0000 (22:39 +0100)

committer GitHub <noreply@github.com>

Fri, 31 Jan 2020 21:39:11 +0000 (22:39 +0100)
author Philipp <admin+Github@philipp.info>
Fri, 31 Jan 2020 21:39:11 +0000 (22:39 +0100)
committer GitHub <noreply@github.com>
Fri, 31 Jan 2020 21:39:11 +0000 (22:39 +0100)
diff --cc include/api.php
Simple merge
diff --cc tests/include/ApiTest.php
Simple merge
author	Philipp <admin+Github@philipp.info>
	Fri, 31 Jan 2020 21:39:11 +0000 (22:39 +0100)
committer	GitHub <noreply@github.com>
	Fri, 31 Jan 2020 21:39:11 +0000 (22:39 +0100)
		1	2
include/api.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/include/ApiTest.php	patch \|	diff1 \|	diff2 \|	blob \| history