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.1	2016-09-19 11:23:07 +02:00
Controller	Merge remote-tracking branch 'origin/master' into 2.2	2016-11-19 15:30:49 +01:00
Event	Fixing tests	2016-10-30 11:27:09 +01:00
fixtures	Use doctrine event to download images	2016-10-30 10:48:29 +01:00
Form/DataTransformer	Jump to Symfony 3.1	2016-06-22 17:59:35 +02:00
Helper	Added http_status in Entry entity	2016-11-18 15:09:21 +01:00
Mock	Jump to Symfony 3.1	2016-06-22 17:59:35 +02:00
ParamConverter	Customize errors templates	2016-10-01 14:58:48 +02:00
Twig	Add simple stats in footer	2016-10-01 16:03:50 +02:00
WallabagCoreTestCase.php	Lock deps for FOSUser	2016-10-11 18:59:08 +02:00