diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-24 12:03:17 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-24 12:03:17 +0200 |
| commit | 64a8781e453c40ff144d03405abe2dc1ccfacbe0 (patch) | |
| tree | 311473a357e3dedd496e1417293eed9a2a116ad6 /app/config | |
| parent | 9313ea9d440e3f93a6bb2d8c0fb6717364cd27f5 (diff) | |
| parent | c64b4941d5222586a82d2c8d6a61969bb9cfe96b (diff) | |
| download | wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.tar.gz wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.tar.zst wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.zip | |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'app/config')
| -rw-r--r-- | app/config/config.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 9dbc9d7c..dfb0e3b2 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
| @@ -30,7 +30,7 @@ framework: | |||
| 30 | assets: ~ | 30 | assets: ~ |
| 31 | 31 | ||
| 32 | wallabag_core: | 32 | wallabag_core: |
| 33 | version: 2.1.2-dev | 33 | version: 2.1.3-dev |
| 34 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" | 34 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" |
| 35 | languages: | 35 | languages: |
| 36 | en: 'English' | 36 | en: 'English' |
| @@ -50,6 +50,7 @@ wallabag_core: | |||
| 50 | rss_limit: 50 | 50 | rss_limit: 50 |
| 51 | reading_speed: 1 | 51 | reading_speed: 1 |
| 52 | cache_lifetime: 10 | 52 | cache_lifetime: 10 |
| 53 | fetching_error_message: "wallabag can't retrieve contents for this article. Please report this issue to us." | ||
| 53 | 54 | ||
| 54 | wallabag_user: | 55 | wallabag_user: |
| 55 | registration_enabled: "%fosuser_registration%" | 56 | registration_enabled: "%fosuser_registration%" |