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
..
ConfigControllerTest.php	Merge remote-tracking branch 'origin/master' into 2.2	2016-11-19 15:30:49 +01:00
EntryControllerTest.php	Check if status code is OK	2016-11-18 23:05:02 +01:00
ExportControllerTest.php	Added test for export by filtering with tag	2016-10-29 14:03:55 +02:00
RssControllerTest.php	Jump to Symfony 3.1	2016-06-22 17:59:35 +02:00
SecurityControllerTest.php	Add simple test	2016-08-24 10:28:43 +02:00
SettingsControllerTest.php	Jump to Symfony 3.1	2016-06-22 17:59:35 +02:00
StaticControllerTest.php	Jump to Symfony 3.1	2016-06-22 17:59:35 +02:00
TagControllerTest.php	Ensure orphan tag are remove in API	2016-10-07 23:31:53 +02:00