diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-03 16:41:29 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-03 16:41:29 +0100 |
commit | 5a619812ca3eb05a82a023ccdaee13501eb8d45f (patch) | |
tree | a1541999a3e13f9bb8b45d3a61320ee61aa4eb3c /app/config/config.yml | |
parent | da4136557963018287cae61226e9006c3c741747 (diff) | |
parent | 84795d015b3c7e1af48a3dda3cb33cf080b66e8f (diff) | |
download | wallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.tar.gz wallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.tar.zst wallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.zip |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'app/config/config.yml')
-rw-r--r-- | app/config/config.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index dfb0e3b2..7f24244d 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -44,13 +44,15 @@ wallabag_core: | |||
44 | es: 'Español' | 44 | es: 'Español' |
45 | oc: 'Occitan' | 45 | oc: 'Occitan' |
46 | it: 'Italiano' | 46 | it: 'Italiano' |
47 | pt: 'Português' | ||
47 | items_on_page: 12 | 48 | items_on_page: 12 |
48 | theme: material | 49 | theme: material |
49 | language: '%locale%' | 50 | language: '%locale%' |
50 | rss_limit: 50 | 51 | rss_limit: 50 |
51 | reading_speed: 1 | 52 | reading_speed: 1 |
52 | cache_lifetime: 10 | 53 | cache_lifetime: 10 |
53 | fetching_error_message: "wallabag can't retrieve contents for this article. Please report this issue to us." | 54 | fetching_error_message: | |
55 | 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>. | ||
54 | 56 | ||
55 | wallabag_user: | 57 | wallabag_user: |
56 | registration_enabled: "%fosuser_registration%" | 58 | registration_enabled: "%fosuser_registration%" |