aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2017-05-19 11:25:19 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2017-05-19 11:25:19 +0200
commit4ab0d25f652bdfe184046be6d50afd594709e1a9 (patch)
tree0a9ea39836619df4b97d4b12bb6a0384e8c2a5ee /app
parent21f78f4d4baae7afaa5845317a9cb52e031f1d1a (diff)
parentf87e6547e8c49a2fe4bd21ec185e99464d4d957e (diff)
downloadwallabag-4ab0d25f652bdfe184046be6d50afd594709e1a9.tar.gz
wallabag-4ab0d25f652bdfe184046be6d50afd594709e1a9.tar.zst
wallabag-4ab0d25f652bdfe184046be6d50afd594709e1a9.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 28abe734..73bf0a0d 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -35,7 +35,7 @@ framework:
35 assets: ~ 35 assets: ~
36 36
37wallabag_core: 37wallabag_core:
38 version: 2.2.2 38 version: 2.2.3
39 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 39 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
40 languages: 40 languages:
41 en: 'English' 41 en: 'English'