From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Tue, 30 May 2017 07:59:06 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 2.3
X-Git-Tag: 2.3.0~31^2~85
X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=d181bd728565454ec53d960f321ed0a4c3bf26c8

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

d181bd728565454ec53d960f321ed0a4c3bf26c8
diff --cc app/config/config.yml
index 73bf0a0d,77cda052..9792616e
--- a/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%"