diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-09-19 11:23:07 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-09-19 11:23:07 +0200 |
commit | d7b4b2c72cd1c9ad967ecfec668d5b0b9e794149 (patch) | |
tree | d20f88d9e9157bf9721c77913096dcd6875231b5 /app/config | |
parent | da18a4682f124b02278860d23ac1d59dee995277 (diff) | |
parent | f9feca5c64309a2a202258bb92ae24b7a1dbe31c (diff) | |
download | wallabag-d7b4b2c72cd1c9ad967ecfec668d5b0b9e794149.tar.gz wallabag-d7b4b2c72cd1c9ad967ecfec668d5b0b9e794149.tar.zst wallabag-d7b4b2c72cd1c9ad967ecfec668d5b0b9e794149.zip |
Merge remote-tracking branch 'origin/master' into 2.1
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 4b869c4f..b3d71304 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.0.7 | 33 | version: 2.0.8 |
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' |