Merge pull request #1941 from wallabag/v2-asynchronous-jobs

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

Mon, 19 Sep 2016 05:15:40 +0000 (07:15 +0200)

committer GitHub <noreply@github.com>

Mon, 19 Sep 2016 05:15:40 +0000 (07:15 +0200)
author Jeremy Benoist <j0k3r@users.noreply.github.com>
Mon, 19 Sep 2016 05:15:40 +0000 (07:15 +0200)
committer GitHub <noreply@github.com>
Mon, 19 Sep 2016 05:15:40 +0000 (07:15 +0200)
diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
Simple merge
diff --cc src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
Simple merge
author	Jeremy Benoist <j0k3r@users.noreply.github.com>
	Mon, 19 Sep 2016 05:15:40 +0000 (07:15 +0200)
committer	GitHub <noreply@github.com>
	Mon, 19 Sep 2016 05:15:40 +0000 (07:15 +0200)
		1	2
src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml	patch \|	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig	patch \|	diff1 \|	diff2 \|	blob \| history