diff options
Diffstat (limited to 'app/config')
-rw-r--r-- | app/config/config.yml | 6 | ||||
-rw-r--r-- | app/config/parameters.yml.dist | 1 |
2 files changed, 5 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 |
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 7a22cb98..f821f2a8 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
@@ -55,3 +55,4 @@ parameters: | |||
55 | redis_host: localhost | 55 | redis_host: localhost |
56 | redis_port: 6379 | 56 | redis_port: 6379 |
57 | redis_path: null | 57 | redis_path: null |
58 | redis_password: null | ||