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
..
developer	Merge remote-tracking branch 'origin/master' into 2.2	2016-11-19 15:30:49 +01:00
user	Merge remote-tracking branch 'origin/master' into 2.2	2016-11-19 15:30:49 +01:00
conf.py	Some fixes about upgrade from 2.0.x -> 2.1.0	2016-09-28 10:04:36 +02:00
index.rst	Merge remote-tracking branch 'origin/master' into 2.2	2016-11-19 15:30:49 +01:00
requirements.txt	add docs	2015-10-21 14:14:51 +02:00