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

diff --cc docs/de/user/upgrade.rst
index af3b96fba26f596809e674a12916d95f5b73c160,76faa4e26c31004cc1429751b2b96e6c0905bc64..fa2aac451b653c8522d730a1f956e146ec390f8a
--- 1/docs/de/user/upgrade.rst
--- 2/docs/de/user/upgrade.rst
+++ b/docs/de/user/upgrade.rst
@@@ -61,9 -61,9 +61,9 @@@ Lade das letzte Release von wallabag he
  
  .. code-block:: bash
  
-     wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
+     wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
  
 -Du findest den `aktuellen MD5-Hash auf unserer Webseite <https://www.wallabag.org/pages/download-wallabag.html>`_.
 +Du findest den `aktuellen MD5-Hash auf unserer Webseite <https://static.wallabag.org/releases/>`_.
  
  Extrahiere das Archiv in deinen wallabag-Ordner und ersetze die ``app/config/parameters.yml`` mit deiner.
  

diff --cc docs/en/user/upgrade.rst
index 359a355f3139e2b32580b630759920cfe74243e7,46b490c32a747afe2c5fa6f2847ce30dca345dce..3157684cb7beb9d870b522be6924da3e90e1e72a
--- 1/docs/en/user/upgrade.rst
--- 2/docs/en/user/upgrade.rst
+++ b/docs/en/user/upgrade.rst
@@@ -65,9 -65,9 +65,9 @@@ Download the last release of wallabag
  
  .. code-block:: bash
  
-     wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
+     wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
  
 -You will find the `md5 hash of the latest package on our website <https://www.wallabag.org/pages/download-wallabag.html>`_.
 +You will find the `md5 hash of the latest package on our website <https://static.wallabag.org/releases/>`_.
  
  Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours.
  

diff --cc docs/fr/user/upgrade.rst
index 5bb42deba48b77f39ca3de351439fa03c2db94da,af97ebb22957d7634da5a2aedd1e0c9a08fb8159..af1980061b824c8da153c7dd607da85887b7abe2
--- 1/docs/fr/user/upgrade.rst
--- 2/docs/fr/user/upgrade.rst
+++ b/docs/fr/user/upgrade.rst
@@@ -61,9 -61,9 +61,9 @@@ Téléchargez la dernière version de w
  
  .. code-block:: bash
  
-     wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
+     wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
  
 -Vous trouverez `le hash md5 du dernier package sur notre site <https://www.wallabag.org/pages/download-wallabag.html>`_.
 +Vous trouverez `le hash md5 du dernier package sur notre site <https://static.wallabag.org/releases/>`_.
  
  Décompressez l'archive dans votre répertoire d'installation et remplacez le fichier ``app/config/parameters.yml`` avec le votre.
  

diff --cc docs/it/user/installation.rst
index c067228dff770cef4aa41f61e473ac3e56c4895c,95d781e661d5b82ca271ccefb4ee0b1d18181667..174507b8f36d0ed3c2fb9689d67c5e386b5ece5b
--- 1/docs/it/user/installation.rst
--- 2/docs/it/user/installation.rst
+++ b/docs/it/user/installation.rst
@@@ -86,9 -86,9 +86,9 @@@ Eseguite questo comando per scaricare e
  
  .. code-block:: bash
  
-    wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
+    wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
  
 -Troverete il `hash md5 del pacchetto piú aggiornato sul nostro sito <https://www.wallabag.org/pages/download-wallabag.html>`_.
 +Troverete il `hash md5 del pacchetto piú aggiornato sul nostro sito <https://static.wallabag.org/releases/>`_.
  
  Ora leggete la seguente documentazione per creare il vostro host virtuale poi accedete al vostro wallabag. Se avete cambiato la configurazione del database per usare MySQL o PostrgreSQL, dovrete creare un utente con il comando php bin/console wallabag:install --env=prod .
  

diff --cc docs/it/user/upgrade.rst
index 52cd98c7f0face2d1bc769ff810b3a8dd967dc95,e1c3f0413f0b8b7f647d71da373c5a7a56485fdc..ede1a1a305fc1854d831ab31fb4894286d19e5dd
--- 1/docs/it/user/upgrade.rst
--- 2/docs/it/user/upgrade.rst
+++ b/docs/it/user/upgrade.rst
@@@ -78,9 -78,9 +78,9 @@@ Scaricate l'ultima versione di wallabag
  
  . code-block:: bash
  
-     wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
+     wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
  
 -Troverete il `hash md5 dell'ultima versione del pacchetto sul nostro sito <https://www.wallabag.org/pages/download-wallabag.html>`_.
 +Troverete il `hash md5 dell'ultima versione del pacchetto sul nostro sito <https://static.wallabag.org/releases/>`_.
  
  Estraete l'archivio nella vostra cartella di wallabag e rimpiazzate ``app/config/parameters.yml`` con il vostro.
  

diff --cc src/Wallabag/ApiBundle/Controller/EntryRestController.php
Simple merge

diff --cc tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
Simple merge