Merge pull request #2393 from wallabag/api-urls-exist

author Nicolas Lœuillet <nicolas@loeuillet.org>

Sat, 8 Oct 2016 11:31:31 +0000 (13:31 +0200)

committer GitHub <noreply@github.com>

Sat, 8 Oct 2016 11:31:31 +0000 (13:31 +0200)
author Nicolas Lœuillet <nicolas@loeuillet.org>
Sat, 8 Oct 2016 11:31:31 +0000 (13:31 +0200)
committer GitHub <noreply@github.com>
Sat, 8 Oct 2016 11:31:31 +0000 (13:31 +0200)
diff --cc src/Wallabag/ApiBundle/Controller/WallabagRestController.php
Simple merge
diff --cc tests/Wallabag/ApiBundle/Controller/WallabagRestControllerTest.php
Simple merge
author	Nicolas Lœuillet <nicolas@loeuillet.org>
	Sat, 8 Oct 2016 11:31:31 +0000 (13:31 +0200)
committer	GitHub <noreply@github.com>
	Sat, 8 Oct 2016 11:31:31 +0000 (13:31 +0200)
		1	2
src/Wallabag/ApiBundle/Controller/WallabagRestController.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/Wallabag/ApiBundle/Controller/WallabagRestControllerTest.php	patch \|	diff1 \|	diff2 \|	blob \| history