Merge remote-tracking branch 'origin/master' into 2.2

[github/wallabag/wallabag.git] / app / config / config.yml

diff --git a/app/config/config.yml b/app/config/config.yml
index 53c26beb5a3a60d5cc04164e1586308696ddb809..487e934bcd0ab1262ff748fc4c9780636e17b503 100644 (file)
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -30,7 +30,7 @@ framework:
     assets: ~
 
 wallabag_core:
-    version: 2.2.0-dev
+    version: 2.1.5
     paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     languages:
         en: 'English'
@@ -218,7 +218,9 @@ fos_oauth_server:
     auth_code_class:     Wallabag\ApiBundle\Entity\AuthCode
     service:
         user_provider: fos_user.user_manager
-
+        options:
+            refresh_token_lifetime: 1209600
+                
 scheb_two_factor:
     trusted_computer:
         enabled: true