Merge pull request #4097 from Rudloff/feature/search_api

author Hypolite Petovan <mrpetovan@gmail.com>

Mon, 18 Dec 2017 14:28:33 +0000 (09:28 -0500)

committer GitHub <noreply@github.com>

Mon, 18 Dec 2017 14:28:33 +0000 (09:28 -0500)
author Hypolite Petovan <mrpetovan@gmail.com>
Mon, 18 Dec 2017 14:28:33 +0000 (09:28 -0500)
committer GitHub <noreply@github.com>
Mon, 18 Dec 2017 14:28:33 +0000 (09:28 -0500)
diff --cc doc/api.md
Simple merge
diff --cc include/api.php
Simple merge
author	Hypolite Petovan <mrpetovan@gmail.com>
	Mon, 18 Dec 2017 14:28:33 +0000 (09:28 -0500)
committer	GitHub <noreply@github.com>
	Mon, 18 Dec 2017 14:28:33 +0000 (09:28 -0500)
		1	2
doc/api.md	patch \|	diff1 \|	diff2 \|	blob \| history
include/api.php	patch \|	diff1 \|	diff2 \|	blob \| history