Merge pull request #2322 from wallabag/v2-404

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

Sat, 1 Oct 2016 14:35:48 +0000 (16:35 +0200)

committer GitHub <noreply@github.com>

Sat, 1 Oct 2016 14:35:48 +0000 (16:35 +0200)
author Nicolas Lœuillet <nicolas@loeuillet.org>
Sat, 1 Oct 2016 14:35:48 +0000 (16:35 +0200)
committer GitHub <noreply@github.com>
Sat, 1 Oct 2016 14:35:48 +0000 (16:35 +0200)
diff --cc src/Wallabag/CoreBundle/Resources/config/services.yml
Simple merge
author	Nicolas Lœuillet <nicolas@loeuillet.org>
	Sat, 1 Oct 2016 14:35:48 +0000 (16:35 +0200)
committer	GitHub <noreply@github.com>
	Sat, 1 Oct 2016 14:35:48 +0000 (16:35 +0200)