Merge pull request #3047 from wallabag/add-notmatches-operator

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

Wed, 3 May 2017 09:53:01 +0000 (11:53 +0200)

committer GitHub <noreply@github.com>

Wed, 3 May 2017 09:53:01 +0000 (11:53 +0200)
author Nicolas Lœuillet <nicolas@loeuillet.org>
Wed, 3 May 2017 09:53:01 +0000 (11:53 +0200)
committer GitHub <noreply@github.com>
Wed, 3 May 2017 09:53:01 +0000 (11:53 +0200)
diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
Simple merge
diff --cc tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
Simple merge
author	Nicolas Lœuillet <nicolas@loeuillet.org>
	Wed, 3 May 2017 09:53:01 +0000 (11:53 +0200)
committer	GitHub <noreply@github.com>
	Wed, 3 May 2017 09:53:01 +0000 (11:53 +0200)
		1	2
src/Wallabag/CoreBundle/Resources/translations/messages.en.yml	patch \|	diff1 \|	diff2 \|	blob \| history
tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php	patch \|	diff1 \|	diff2 \|	blob \| history