aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
diff options
context:
space:
mode:
Diffstat (limited to 'app/config')
-rw-r--r--app/config/config.yml2
-rw-r--r--app/config/routing.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 48f317c7..2f102c45 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.1.1 33 version: 2.1.2-dev
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'
diff --git a/app/config/routing.yml b/app/config/routing.yml
index 2be74d7f..750ed435 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -13,6 +13,11 @@ wallabag_user:
13 prefix: /users 13 prefix: /users
14 14
15wallabag_api: 15wallabag_api:
16 resource: "@WallabagApiBundle/Controller/"
17 type: annotation
18 prefix: /
19
20wallabag_api:
16 resource: "@WallabagApiBundle/Resources/config/routing.yml" 21 resource: "@WallabagApiBundle/Resources/config/routing.yml"
17 prefix: / 22 prefix: /
18 23