Merge pull request #1337 from modos189/v2_material

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

Mon, 17 Aug 2015 13:32:59 +0000 (15:32 +0200)

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

Mon, 17 Aug 2015 13:32:59 +0000 (15:32 +0200)
author Nicolas Lœuillet <nicolas@loeuillet.org>
Mon, 17 Aug 2015 13:32:59 +0000 (15:32 +0200)
committer Nicolas Lœuillet <nicolas@loeuillet.org>
Mon, 17 Aug 2015 13:32:59 +0000 (15:32 +0200)
diff --cc src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
Simple merge
diff --cc src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
Simple merge
author	Nicolas Lœuillet <nicolas@loeuillet.org>
	Mon, 17 Aug 2015 13:32:59 +0000 (15:32 +0200)
committer	Nicolas Lœuillet <nicolas@loeuillet.org>
	Mon, 17 Aug 2015 13:32:59 +0000 (15:32 +0200)
		1	2
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig	patch \|	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig	patch \|	diff1 \|	diff2 \|	blob \| history