Merge pull request #3995 from wallabag/feature/config-display-login

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

Wed, 12 Jun 2019 19:36:00 +0000 (21:36 +0200)

committer GitHub <noreply@github.com>

Wed, 12 Jun 2019 19:36:00 +0000 (21:36 +0200)
author Jérémy Benoist <j0k3r@users.noreply.github.com>
Wed, 12 Jun 2019 19:36:00 +0000 (21:36 +0200)
committer GitHub <noreply@github.com>
Wed, 12 Jun 2019 19:36:00 +0000 (21:36 +0200)
diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
Simple merge
diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
Simple merge
diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
Simple merge
diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
Simple merge
diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
Simple merge
diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
Simple merge
diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
Simple merge
diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
Simple merge
diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
Simple merge
diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
Simple merge
diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
Simple merge
diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
Simple merge
diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
Simple merge
diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
Simple merge
author	Jérémy Benoist <j0k3r@users.noreply.github.com>
	Wed, 12 Jun 2019 19:36:00 +0000 (21:36 +0200)
committer	GitHub <noreply@github.com>
	Wed, 12 Jun 2019 19:36:00 +0000 (21:36 +0200)
		1	2
src/Wallabag/CoreBundle/Resources/translations/messages.da.yml	patch \|	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.de.yml	patch \|	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.en.yml	patch \|	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.es.yml	patch \|	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml	patch \|	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml	patch \|	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.it.yml	patch \|	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml	patch \|	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml	patch \|	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml	patch \|	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml	patch \|	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml	patch \|	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.th.yml	patch \|	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml	patch \|	diff1 \|	diff2 \|	blob \| history