Merge pull request #2460 from wallabag/ui-changes

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

Fri, 4 Nov 2016 07:49:52 +0000 (08:49 +0100)

committer GitHub <noreply@github.com>

Fri, 4 Nov 2016 07:49:52 +0000 (08:49 +0100)
author Nicolas Lœuillet <nicolas@loeuillet.org>
Fri, 4 Nov 2016 07:49:52 +0000 (08:49 +0100)
committer GitHub <noreply@github.com>
Fri, 4 Nov 2016 07:49:52 +0000 (08:49 +0100)
diff --cc src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
Simple merge
diff --cc src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
Simple merge
author	Nicolas Lœuillet <nicolas@loeuillet.org>
	Fri, 4 Nov 2016 07:49:52 +0000 (08:49 +0100)
committer	GitHub <noreply@github.com>
	Fri, 4 Nov 2016 07:49:52 +0000 (08:49 +0100)
		1	2
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig	patch \|	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig	patch \|	diff1 \|	diff2 \|	blob \| history