oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-01 17:38:38 +00:00
Code Wiki Activity

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

Browse source
This commit is contained in:
Jeremy Benoist 2016-11-21 15:15:30 +01:00
commit eb2d613c3e
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/config/config.yml
View file

@ -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