Jeremy Benoist 68003139e1 Merge remote-tracking branch 'origin/master' into 2.2 ... # Conflicts: # .editorconfig # docs/de/index.rst # docs/de/user/import.rst # docs/en/index.rst # docs/en/user/configuration.rst # docs/en/user/import.rst # docs/fr/index.rst # docs/fr/user/import.rst # src/Wallabag/CoreBundle/Command/InstallCommand.php # src/Wallabag/CoreBundle/Resources/translations/messages.da.yml # src/Wallabag/CoreBundle/Resources/translations/messages.de.yml # src/Wallabag/CoreBundle/Resources/translations/messages.en.yml # src/Wallabag/CoreBundle/Resources/translations/messages.es.yml # src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml # src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml # src/Wallabag/CoreBundle/Resources/translations/messages.it.yml # src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml # src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml # src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml # src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml # src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml # src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig # web/bundles/wallabagcore/themes/baggy/css/style.min.css # web/bundles/wallabagcore/themes/baggy/js/baggy.min.js # web/bundles/wallabagcore/themes/material/css/style.min.css # web/bundles/wallabagcore/themes/material/js/material.min.js		2016-11-19 15:30:49 +01:00
..
android.rst	Reordered 🇫🇷 documentation	2016-11-17 19:22:16 +01:00
articles.rst	Reordered 🇫🇷 documentation	2016-11-17 19:22:16 +01:00
backup.rst	Reordered 🇫🇷 documentation	2016-11-17 19:22:16 +01:00
configuration.rst	Merge remote-tracking branch 'origin/master' into 2.2	2016-11-19 15:30:49 +01:00
create_account.rst	Reordered 🇫🇷 documentation	2016-11-17 19:22:16 +01:00
errors_during_fetching.rst	Reordered 🇫🇷 documentation	2016-11-17 19:22:16 +01:00
faq.rst	Update faq.rst	2016-11-02 18:08:25 +01:00
filters.rst	Merge remote-tracking branch 'origin/master' into 2.2	2016-11-19 15:30:49 +01:00
import.rst	Merge remote-tracking branch 'origin/master' into 2.2	2016-11-19 15:30:49 +01:00
installation.rst	fix #2582 - Nginx config: disable all other PHP file from symphony	2016-11-14 11:58:26 +01:00
parameters.rst	Reordered 🇫🇷 documentation	2016-11-17 19:22:16 +01:00
tags.rst	french translation for login doc	2016-02-20 09:16:22 +01:00
upgrade.rst	Reordered 🇫🇷 documentation	2016-11-17 19:22:16 +01:00