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

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

Tue, 11 Oct 2016 19:01:30 +0000 (21:01 +0200)

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

Tue, 11 Oct 2016 19:01:30 +0000 (21:01 +0200)
author Jeremy Benoist <jeremy.benoist@gmail.com>
Tue, 11 Oct 2016 19:01:30 +0000 (21:01 +0200)
committer Jeremy Benoist <jeremy.benoist@gmail.com>
Tue, 11 Oct 2016 19:01:30 +0000 (21:01 +0200)
diff --cc src/Wallabag/CoreBundle/Command/InstallCommand.php
Simple merge
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.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
diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
Simple merge
author	Jeremy Benoist <jeremy.benoist@gmail.com>
	Tue, 11 Oct 2016 19:01:30 +0000 (21:01 +0200)
committer	Jeremy Benoist <jeremy.benoist@gmail.com>
	Tue, 11 Oct 2016 19:01:30 +0000 (21:01 +0200)
		1	2
src/Wallabag/CoreBundle/Command/InstallCommand.php	patch \|	diff1 \|	diff2 \|	blob \| history
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.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
src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml	patch \|	diff1 \|	diff2 \|	blob \| history