aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2017-05-30 09:59:06 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2017-05-30 09:59:06 +0200
commitd181bd728565454ec53d960f321ed0a4c3bf26c8 (patch)
tree0339aca4a13dc41016bc12081c42b2405dc6f929 /app
parent7a90ca6171995e16b74f14712fafb42b636bdb3e (diff)
parent82a590fdddcb2458fc7f79d300cc12be3500b09c (diff)
downloadwallabag-d181bd728565454ec53d960f321ed0a4c3bf26c8.tar.gz
wallabag-d181bd728565454ec53d960f321ed0a4c3bf26c8.tar.zst
wallabag-d181bd728565454ec53d960f321ed0a4c3bf26c8.zip
Merge remote-tracking branch 'origin/master' into 2.3
Diffstat (limited to 'app')
-rw-r--r--app/config/config.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 73bf0a0d..9792616e 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -59,7 +59,7 @@ wallabag_core:
59 action_mark_as_read: 1 59 action_mark_as_read: 1
60 list_mode: 0 60 list_mode: 0
61 fetching_error_message: | 61 fetching_error_message: |
62 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>. 62 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>.
63 api_limit_mass_actions: 10 63 api_limit_mass_actions: 10
64 64
65wallabag_user: 65wallabag_user: