Merge pull request #2230 from modos189/issue_2055

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

Tue, 23 Aug 2016 15:24:46 +0000 (17:24 +0200)

committer GitHub <noreply@github.com>

Tue, 23 Aug 2016 15:24:46 +0000 (17:24 +0200)
author Nicolas Lœuillet <nicolas@loeuillet.org>
Tue, 23 Aug 2016 15:24:46 +0000 (17:24 +0200)
committer GitHub <noreply@github.com>
Tue, 23 Aug 2016 15:24:46 +0000 (17:24 +0200)
diff --cc src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css
Simple merge
diff --cc src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
Simple merge
diff --cc src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
Simple merge
author	Nicolas Lœuillet <nicolas@loeuillet.org>
	Tue, 23 Aug 2016 15:24:46 +0000 (17:24 +0200)
committer	GitHub <noreply@github.com>
	Tue, 23 Aug 2016 15:24:46 +0000 (17:24 +0200)
		1	2
src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css	patch \|	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig	patch \|	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig	patch \|	diff1 \|	diff2 \|	blob \| history