diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-11-21 13:14:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-21 13:14:31 +0100 |
commit | 625bb561813222aea8a7a2e84e30e9f9de697017 (patch) | |
tree | 06c989b4bc6910aa0207b890dbc96db3217efe9d /app/config | |
parent | 83fed2648bf49f9d22903a18284dbaa9d661034c (diff) | |
parent | 05cdd393d8035f2db5b5982cb9bb38832fc35732 (diff) | |
download | wallabag-625bb561813222aea8a7a2e84e30e9f9de697017.tar.gz wallabag-625bb561813222aea8a7a2e84e30e9f9de697017.tar.zst wallabag-625bb561813222aea8a7a2e84e30e9f9de697017.zip |
Merge pull request #2624 from Rurik19/master
Fix #2056 update config.yml
Diffstat (limited to 'app/config')
-rw-r--r-- | app/config/config.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 944ae40f..3d9067d1 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -193,7 +193,9 @@ fos_oauth_server: | |||
193 | auth_code_class: Wallabag\ApiBundle\Entity\AuthCode | 193 | auth_code_class: Wallabag\ApiBundle\Entity\AuthCode |
194 | service: | 194 | service: |
195 | user_provider: fos_user.user_manager | 195 | user_provider: fos_user.user_manager |
196 | 196 | options: | |
197 | refresh_token_lifetime: 1209600 | ||
198 | |||
197 | scheb_two_factor: | 199 | scheb_two_factor: |
198 | trusted_computer: | 200 | trusted_computer: |
199 | enabled: true | 201 | enabled: true |