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

2016-11-21 15:15:30 +01:00
parent a38d50e1e8 625bb56181
commit eb2d613c3e
3 changed files with 14 additions and 4 deletions
--- 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