diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2017-01-18 10:24:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-18 10:24:24 +0100 |
| commit | 05fa529bcfde01be5d320cb532900d72cf4b0830 (patch) | |
| tree | ed6621c5197be9758c312a4bbe9bf2a852c4b878 /app | |
| parent | 9123cb3053a1e5e8730e44a2723cd61bb9b08512 (diff) | |
| parent | 1ba542ce04fb3e573bc605d24251dca3b3bf5b48 (diff) | |
| download | wallabag-05fa529bcfde01be5d320cb532900d72cf4b0830.tar.gz wallabag-05fa529bcfde01be5d320cb532900d72cf4b0830.tar.zst wallabag-05fa529bcfde01be5d320cb532900d72cf4b0830.zip | |
Merge pull request #2759 from wallabag/prepare-2162.1.6
Prepare wallabag 2.1.6 :rocket:
Diffstat (limited to 'app')
| -rw-r--r-- | app/config/config.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 3d9067d1..ca0ba1d8 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' |
| @@ -195,7 +195,7 @@ fos_oauth_server: | |||
| 195 | user_provider: fos_user.user_manager | 195 | user_provider: fos_user.user_manager |
| 196 | options: | 196 | options: |
| 197 | refresh_token_lifetime: 1209600 | 197 | refresh_token_lifetime: 1209600 |
| 198 | 198 | ||
| 199 | scheb_two_factor: | 199 | scheb_two_factor: |
| 200 | trusted_computer: | 200 | trusted_computer: |
| 201 | enabled: true | 201 | enabled: true |