diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-11 21:01:30 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-11 21:01:30 +0200 |
| commit | e4cf672ccf61689ba28c2e89fc55f83167800b18 (patch) | |
| tree | 5dc22c97797bdcdd0a3d2a7e182410f04a748c1e /app/config/config.yml | |
| parent | e57df5611fe82ce61a71d51c762ee9296f18c3ac (diff) | |
| parent | dbe94e73a9eaf3acb250812913b0303b35d01a2e (diff) | |
| download | wallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.tar.gz wallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.tar.zst wallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.zip | |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'app/config/config.yml')
| -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 75d7299c..bcc4c8eb 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.1 | 33 | version: 2.1.2-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' |