Merge remote-tracking branch 'origin/master' into 2.2

diff --cc app/config/config.yml
Simple merge

diff --cc docs/en/user/configuration.rst
Simple merge

diff --cc docs/en/user/parameters.rst
index 2fca020efbee549f1de1fccf270d44de467b4507,6cbd5ae4ba3dea4c7e6947eb48bb3276289c4a80..c35cf3b8ae6026423738ef1302e3b0efe4472a64
--- 1/docs/en/user/parameters.rst
--- 2/docs/en/user/parameters.rst
+++ b/docs/en/user/parameters.rst
@@@ -9,10 -9,9 +9,10 @@@ What is the meaning of the parameters
     "database_name", "symfony", "name of your database"
     "database_user", "root", "user that can write to this database"
     "database_password", "~", "password of that user"
-    "database_path", "``""%kernel.root_dir%/../data/db/wallabag.sqlite""``", "only for SQLite, define where to put the database file. Leave it for other database"
+    "database_path", "``""%kernel.root_dir%/../data/db/wallabag.sqlite""``", "only for SQLite, define where to put the database file. Leave it empty for other database"
     "database_table_prefix", "wallabag_", "all wallabag's tables will be prefixed with that string. You can include a ``_`` for clarity"
     "database_socket", "null", "If your database is using a socket instead of tcp, put the path of the socket (other connection parameters will then be ignored)"
 +   "database_charset", "utf8mb4", "For PostgreSQL & SQLite you should use utf8, for MySQL use utf8mb4 which handle emoji"
  
  .. csv-table:: Configuration to send emails from wallabag
     :header: "name", "default", "description"

diff --cc docs/fr/user/configuration.rst
Simple merge

diff --cc src/Wallabag/CoreBundle/Command/InstallCommand.php
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/config/services.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 7d1a801a2907462fa2b6efd4c235542fe466d58c,a4659620b31c78a9728419fa3c72145a4daf76bf..e0567d7e1b74d71a2892b211db3143cb3fb66f35
--- 1/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
--- 2/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@@ -448,15 -436,18 +448,18 @@@ user
          repeat_new_password_label: 'Confirmatz vòstre novèl senhal'
          plain_password_label: 'Senhal en clar'
          email_label: 'Adreça de corrièl'
 -        # enabled_label: 'Enabled'
 -        # locked_label: 'Locked'
 -        # last_login_label: 'Last login'
 -        # twofactor_label: Two factor authentication
 -        # save: Save
 -        # delete: Delete
 -        # delete_confirm: Are you sure?
 -        # back_to_list: Back to list
 +        enabled_label: 'Actiu'
 +        locked_label: 'Varrolhat'
 +        last_login_label: 'Darrièra connexion'
 +        twofactor_label: 'Autentificacion doble-factor'
 +        save: 'Enregistrar'
 +        delete: 'Suprimir'
 +        delete_confirm: 'Sètz segur ?'
 +        back_to_list: 'Tornar a la lista'
  
+ error:
+     # page_title: An error occurred
+ 
  flashes:
      config:
          notice:

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
Simple merge