aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config/config.yml
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-08-22 23:03:16 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-08-22 23:03:16 +0200
commit79efca1e6ff28362d4bd2713f68205294cdd07de (patch)
treec20482071f97b5ba0f075d59a9a097b08b26b910 /app/config/config.yml
parent9c545fe028013b30417c1a932cd6b9027bff752d (diff)
parent80bb0b73445092c4aa3e94f90cc5f8667fa123ba (diff)
downloadwallabag-79efca1e6ff28362d4bd2713f68205294cdd07de.tar.gz
wallabag-79efca1e6ff28362d4bd2713f68205294cdd07de.tar.zst
wallabag-79efca1e6ff28362d4bd2713f68205294cdd07de.zip
Merge remote-tracking branch 'origin/master' into 2.1
Diffstat (limited to 'app/config/config.yml')
-rw-r--r--app/config/config.yml7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index a1517e97..80754393 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -30,7 +30,7 @@ framework:
30 assets: ~ 30 assets: ~
31 31
32wallabag_core: 32wallabag_core:
33 version: 2.0.5 33 version: 2.0.7
34 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 34 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
35 languages: 35 languages:
36 en: 'English' 36 en: 'English'
@@ -140,6 +140,11 @@ nelmio_cors:
140 '^/api/': 140 '^/api/':
141 allow_origin: ['*'] 141 allow_origin: ['*']
142 allow_headers: ['X-Custom-Auth'] 142 allow_headers: ['X-Custom-Auth']
143 allow_methods: ['POST', 'PUT', 'PATCH','GET', 'DELETE']
144 max_age: 3600
145 '^/oauth/':
146 allow_origin: ['*']
147 allow_headers: ['X-Custom-Auth']
143 allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] 148 allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
144 max_age: 3600 149 max_age: 3600
145 '^/': 150 '^/':