Merge pull request #2455 from wallabag/fix-material-config-tabs

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

Sun, 16 Oct 2016 19:06:23 +0000 (21:06 +0200)

committer GitHub <noreply@github.com>

Sun, 16 Oct 2016 19:06:23 +0000 (21:06 +0200)
author Jeremy Benoist <j0k3r@users.noreply.github.com>
Sun, 16 Oct 2016 19:06:23 +0000 (21:06 +0200)
committer GitHub <noreply@github.com>
Sun, 16 Oct 2016 19:06:23 +0000 (21:06 +0200)
diff --cc src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
Simple merge
author	Jeremy Benoist <j0k3r@users.noreply.github.com>
	Sun, 16 Oct 2016 19:06:23 +0000 (21:06 +0200)
committer	GitHub <noreply@github.com>
	Sun, 16 Oct 2016 19:06:23 +0000 (21:06 +0200)