Merge pull request #2324 from wallabag/edit-tagging-rule

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

Sun, 2 Oct 2016 09:05:10 +0000 (11:05 +0200)

committer GitHub <noreply@github.com>

Sun, 2 Oct 2016 09:05:10 +0000 (11:05 +0200)
author Jeremy Benoist <j0k3r@users.noreply.github.com>
Sun, 2 Oct 2016 09:05:10 +0000 (11:05 +0200)
committer GitHub <noreply@github.com>
Sun, 2 Oct 2016 09:05:10 +0000 (11:05 +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.ro.yml
Simple merge
author	Jeremy Benoist <j0k3r@users.noreply.github.com>
	Sun, 2 Oct 2016 09:05:10 +0000 (11:05 +0200)
committer	GitHub <noreply@github.com>
	Sun, 2 Oct 2016 09:05:10 +0000 (11:05 +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.ro.yml	patch \|	diff1 \|	diff2 \|	blob \| history