Merge pull request #3765 from burkemw3/patch-2

author Jérémy Benoist <j0k3r@users.noreply.github.com>

Mon, 26 Nov 2018 12:51:00 +0000 (13:51 +0100)

committer GitHub <noreply@github.com>

Mon, 26 Nov 2018 12:51:00 +0000 (13:51 +0100)
author Jérémy Benoist <j0k3r@users.noreply.github.com>
Mon, 26 Nov 2018 12:51:00 +0000 (13:51 +0100)
committer GitHub <noreply@github.com>
Mon, 26 Nov 2018 12:51:00 +0000 (13:51 +0100)
diff --cc src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
Simple merge
diff --cc src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
Simple merge
author	Jérémy Benoist <j0k3r@users.noreply.github.com>
	Mon, 26 Nov 2018 12:51:00 +0000 (13:51 +0100)
committer	GitHub <noreply@github.com>
	Mon, 26 Nov 2018 12:51:00 +0000 (13:51 +0100)
		1	2
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig	patch \|	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig	patch \|	diff1 \|	diff2 \|	blob \| history