Merge pull request #2052 from danbartram/feature-filter-unread

author Jeremy Benoist <j0k3r@users.noreply.github.com>

Fri, 27 May 2016 07:57:51 +0000 (09:57 +0200)

committer Jeremy Benoist <j0k3r@users.noreply.github.com>

Fri, 27 May 2016 07:57:51 +0000 (09:57 +0200)
author Jeremy Benoist <j0k3r@users.noreply.github.com>
Fri, 27 May 2016 07:57:51 +0000 (09:57 +0200)
committer Jeremy Benoist <j0k3r@users.noreply.github.com>
Fri, 27 May 2016 07:57:51 +0000 (09:57 +0200)
diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
Simple merge
diff --cc src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
Simple merge
author	Jeremy Benoist <j0k3r@users.noreply.github.com>
	Fri, 27 May 2016 07:57:51 +0000 (09:57 +0200)
committer	Jeremy Benoist <j0k3r@users.noreply.github.com>
	Fri, 27 May 2016 07:57:51 +0000 (09:57 +0200)
		1	2
src/Wallabag/CoreBundle/Resources/translations/messages.en.yml	patch \|	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig	patch \|	diff1 \|	diff2 \|	blob \| history