Merge pull request #3095 from aaa2000/api-error-on-fail-fetch-content

author Thomas Citharel <tcit@tcit.fr>

Wed, 10 May 2017 07:38:55 +0000 (09:38 +0200)

committer GitHub <noreply@github.com>

Wed, 10 May 2017 07:38:55 +0000 (09:38 +0200)
author Thomas Citharel <tcit@tcit.fr>
Wed, 10 May 2017 07:38:55 +0000 (09:38 +0200)
committer GitHub <noreply@github.com>
Wed, 10 May 2017 07:38:55 +0000 (09:38 +0200)
diff --cc src/Wallabag/ApiBundle/Controller/EntryRestController.php
Simple merge
diff --cc tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
Simple merge
author	Thomas Citharel <tcit@tcit.fr>
	Wed, 10 May 2017 07:38:55 +0000 (09:38 +0200)
committer	GitHub <noreply@github.com>
	Wed, 10 May 2017 07:38:55 +0000 (09:38 +0200)
		1	2
src/Wallabag/ApiBundle/Controller/EntryRestController.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php	patch \|	diff1 \|	diff2 \|	blob \| history