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
..
assets/images	Move related event things in Event folder	2016-10-30 09:58:39 +01:00
bundles/wallabagcore/themes	Merge remote-tracking branch 'origin/master' into 2.2	2016-11-19 15:30:49 +01:00
js	Added new shortcuts	2016-11-15 21:54:34 +01:00
uploads/import	Rewrote Wallabag v1 import	2016-01-02 23:27:41 +01:00
.htaccess	Switch to Symfony 3 structure	2016-01-15 09:35:39 +01:00
app.php	Jump to Symfony 3.1	2016-06-22 17:59:35 +02:00
app_dev.php	Switch to Symfony 3 structure	2016-01-15 09:35:39 +01:00
favicon.ico	SensioLabsInsight fixes	2016-01-22 21:12:11 +01:00
robots.txt	Switch to Symfony 3 structure	2016-01-15 09:35:39 +01:00