diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-21 15:15:30 +0100 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-21 15:15:30 +0100 |
| commit | eb2d613c3ed95d741e987917f976da349ea240eb (patch) | |
| tree | 589ebf10ebf557e6fb4d8524f08f13dacfc92ff2 /app | |
| parent | a38d50e1e8a6ff509852b2fee8cd94d79aea7919 (diff) | |
| parent | 625bb561813222aea8a7a2e84e30e9f9de697017 (diff) | |
| download | wallabag-eb2d613c3ed95d741e987917f976da349ea240eb.tar.gz wallabag-eb2d613c3ed95d741e987917f976da349ea240eb.tar.zst wallabag-eb2d613c3ed95d741e987917f976da349ea240eb.zip | |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'app')
| -rw-r--r-- | app/config/config.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 53c26beb..487e934b 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.0-dev | 33 | version: 2.1.5 |
| 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' |
| @@ -218,7 +218,9 @@ fos_oauth_server: | |||
| 218 | auth_code_class: Wallabag\ApiBundle\Entity\AuthCode | 218 | auth_code_class: Wallabag\ApiBundle\Entity\AuthCode |
| 219 | service: | 219 | service: |
| 220 | user_provider: fos_user.user_manager | 220 | user_provider: fos_user.user_manager |
| 221 | 221 | options: | |
| 222 | refresh_token_lifetime: 1209600 | ||
| 223 | |||
| 222 | scheb_two_factor: | 224 | scheb_two_factor: |
| 223 | trusted_computer: | 225 | trusted_computer: |
| 224 | enabled: true | 226 | enabled: true |