]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge pull request #2624 from Rurik19/master
authorJeremy Benoist <j0k3r@users.noreply.github.com>
Mon, 21 Nov 2016 12:14:31 +0000 (13:14 +0100)
committerGitHub <noreply@github.com>
Mon, 21 Nov 2016 12:14:31 +0000 (13:14 +0100)
Fix #2056 update config.yml

1  2 
app/config/config.yml

diff --combined app/config/config.yml
index 944ae40f5443692f51a908e56634ffec7082c1a8,85383f131259df55ec0d957310fbefd79a24573b..3d9067d1a9d51c70ec59dfea59c309350fa4c779
@@@ -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