• Jérémy's avatar
    Merge remote-tracking branch 'origin/master' into 2.2 · 68003139
    Jérémy authored
    # 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
    68003139