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
..
capistrano	Updated Capistrano configuration	2016-10-29 14:39:07 +02:00
tests	Add verification check for MySQL version	2016-10-22 13:41:03 +02:00
config_dev.yml	Store cache lifetime in config	2016-09-03 14:02:50 +02:00
config_prod.yml	Remove useless spaces	2016-06-24 11:28:07 +02:00
config_test.yml	Fix emoji insertion in MySQL	2016-10-22 13:13:07 +02:00
config.yml	Merge remote-tracking branch 'origin/master' into 2.2	2016-11-19 15:30:49 +01:00
parameters_test.yml	SQLite should use utf8, not utf8mb4	2016-10-24 10:10:38 +02:00
parameters.yml.dist	Add verification check for MySQL version	2016-10-22 13:41:03 +02:00
routing_dev.yml	Remove useless spaces	2016-06-24 11:28:07 +02:00
routing_rest.yml	ApiDoc & Route annotation were conflicted	2016-10-15 16:46:42 +02:00
routing.yml	Added shortcuts	2016-11-15 21:54:20 +01:00
security.yml	Add users management UI	2016-10-02 11:08:53 +02:00
services.yml	Move related event things in Event folder	2016-10-30 09:58:39 +01:00