diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-01-26 13:32:07 +0100 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-01-26 13:32:07 +0100 |
| commit | 78295b99dd1721c613f1ce52e2debbe6f6db7753 (patch) | |
| tree | e76f3e8142399316ec5660fab8c646b2c34b8336 /app | |
| parent | 463cb376e357d50c5913452fba68a70bf43492c9 (diff) | |
| parent | 05fa529bcfde01be5d320cb532900d72cf4b0830 (diff) | |
| download | wallabag-78295b99dd1721c613f1ce52e2debbe6f6db7753.tar.gz wallabag-78295b99dd1721c613f1ce52e2debbe6f6db7753.tar.zst wallabag-78295b99dd1721c613f1ce52e2debbe6f6db7753.zip | |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'app')
| -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 05c82e43..68f70d67 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.5 | 33 | version: 2.1.6 |
| 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' |