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
..
Command	Merge remote-tracking branch 'origin/master' into 2.2	2016-11-19 15:30:49 +01:00
Controller	Merge remote-tracking branch 'origin/master' into 2.2	2016-11-19 15:30:49 +01:00
DataFixtures/ORM	Added a configuration to define the redirection after archiving an entry	2016-11-16 23:07:34 +01:00
DependencyInjection	If reload content failed, don’t update it	2016-10-20 22:49:46 +02:00
Entity	Merge remote-tracking branch 'origin/master' into 2.2	2016-11-19 15:30:49 +01:00
Event	Cleanup	2016-11-03 18:01:25 +01:00
Form	Merge remote-tracking branch 'origin/master' into 2.2	2016-11-19 15:30:49 +01:00
Helper	Merge remote-tracking branch 'origin/master' into 2.2	2016-11-19 15:30:49 +01:00
Operator	Add phpdoc for all Matches implementations	2015-11-13 20:50:09 +01:00
ParamConverter	Customize errors templates	2016-10-01 14:58:48 +02:00
Repository	Use created_at as default sort	2016-11-04 07:56:04 +01:00
Resources	Merge remote-tracking branch 'origin/master' into 2.2	2016-11-19 15:30:49 +01:00
Tools	Convert array + phpDoc	2016-04-12 12:25:29 +02:00
Twig	Translate date	2016-10-20 21:16:01 +02:00
WallabagCoreBundle.php	Move API stuff in ApiBundle	2015-04-01 21:59:12 +02:00