Merge remote-tracking branch 'origin/master' into 2.3

author Jeremy Benoist <jeremy.benoist@gmail.com>

Sat, 10 Jun 2017 12:41:30 +0000 (14:41 +0200)

committer Jeremy Benoist <jeremy.benoist@gmail.com>

Sat, 10 Jun 2017 12:41:30 +0000 (14:41 +0200)
author Jeremy Benoist <jeremy.benoist@gmail.com>
Sat, 10 Jun 2017 12:41:30 +0000 (14:41 +0200)
committer Jeremy Benoist <jeremy.benoist@gmail.com>
Sat, 10 Jun 2017 12:41:30 +0000 (14:41 +0200)
diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
Simple merge
diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
Simple merge
diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
Simple merge
diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.it.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.tr.yml
Simple merge
author	Jeremy Benoist <jeremy.benoist@gmail.com>
	Sat, 10 Jun 2017 12:41:30 +0000 (14:41 +0200)
committer	Jeremy Benoist <jeremy.benoist@gmail.com>
	Sat, 10 Jun 2017 12:41:30 +0000 (14:41 +0200)
		1	2
src/Wallabag/CoreBundle/Resources/translations/messages.da.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.fa.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.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.tr.yml	patch \|	diff1 \|	diff2 \|	blob \| history