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

diff --cc app/config/config.yml
index 73bf0a0d2cdcc3518c486c67dbc7331db7b9e543,77cda052b8f37bc44e749b0f2852aa43eaf060c3..9792616ec97e0182b8a0d3060215702af1630c41
--- 1/app/config/config.yml
--- 2/app/config/config.yml
+++ b/app/config/config.yml
@@@ -57,10 -52,9 +57,10 @@@ wallabag_core
      reading_speed: 1
      cache_lifetime: 10
      action_mark_as_read: 1
 -    list_mode: 1
 +    list_mode: 0
      fetching_error_message: |
-         wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
+         wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
 +    api_limit_mass_actions: 10
  
  wallabag_user:
      registration_enabled: "%fosuser_registration%"

diff --cc tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
Simple merge