Merge pull request #3053 from wallabag/api-bulk-add

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

Fri, 5 May 2017 11:56:34 +0000 (13:56 +0200)

committer GitHub <noreply@github.com>

Fri, 5 May 2017 11:56:34 +0000 (13:56 +0200)
author Nicolas Lœuillet <nicolas@loeuillet.org>
Fri, 5 May 2017 11:56:34 +0000 (13:56 +0200)
committer GitHub <noreply@github.com>
Fri, 5 May 2017 11:56:34 +0000 (13:56 +0200)
diff --cc tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
Simple merge
author	Nicolas Lœuillet <nicolas@loeuillet.org>
	Fri, 5 May 2017 11:56:34 +0000 (13:56 +0200)
committer	GitHub <noreply@github.com>
	Fri, 5 May 2017 11:56:34 +0000 (13:56 +0200)