diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-03-28 14:07:42 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-03-28 14:07:42 +0200 |
commit | 7d1d961267c129e2110ce9cc14c5a9d0a7d255cb (patch) | |
tree | d260d7b4ffc8466d7d410ec61bd896bdadd8456e /app/config | |
parent | e1cc8fd79921fdff9999087ba896c88b14ffc0cd (diff) | |
parent | 6ae579e43f6a4ffe607a6361191366410d19f806 (diff) | |
download | wallabag-7d1d961267c129e2110ce9cc14c5a9d0a7d255cb.tar.gz wallabag-7d1d961267c129e2110ce9cc14c5a9d0a7d255cb.tar.zst wallabag-7d1d961267c129e2110ce9cc14c5a9d0a7d255cb.zip |
Merge remote-tracking branch 'origin/master' into 2.3
Diffstat (limited to 'app/config')
-rw-r--r-- | app/config/config.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 4e802c98..d7231112 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.2.1 | 33 | version: 2.2.2 |
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' |