From: Jeremy Benoist <j0k3r@users.noreply.github.com>
Date: Mon, 21 Nov 2016 12:14:31 +0000 (+0100)
Subject: Merge pull request #2624 from Rurik19/master
X-Git-Tag: 2.1.6~3
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=625bb561813222aea8a7a2e84e30e9f9de697017;hp=-c;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #2624 from Rurik19/master

Fix #2056 update config.yml
---

625bb561813222aea8a7a2e84e30e9f9de697017
diff --combined app/config/config.yml
index 944ae40f,85383f13..3d9067d1
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@@ -30,7 -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'
@@@ -193,7 -193,9 +193,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