diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-11 21:01:30 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-11 21:01:30 +0200 |
| commit | e4cf672ccf61689ba28c2e89fc55f83167800b18 (patch) | |
| tree | 5dc22c97797bdcdd0a3d2a7e182410f04a748c1e /app/config/routing.yml | |
| parent | e57df5611fe82ce61a71d51c762ee9296f18c3ac (diff) | |
| parent | dbe94e73a9eaf3acb250812913b0303b35d01a2e (diff) | |
| download | wallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.tar.gz wallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.tar.zst wallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.zip | |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'app/config/routing.yml')
| -rw-r--r-- | app/config/routing.yml | 5 |
1 files changed, 5 insertions, 0 deletions
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 | ||
| 15 | wallabag_api: | 15 | wallabag_api: |
| 16 | resource: "@WallabagApiBundle/Controller/" | ||
| 17 | type: annotation | ||
| 18 | prefix: / | ||
| 19 | |||
| 20 | wallabag_api: | ||
| 16 | resource: "@WallabagApiBundle/Resources/config/routing.yml" | 21 | resource: "@WallabagApiBundle/Resources/config/routing.yml" |
| 17 | prefix: / | 22 | prefix: / |
| 18 | 23 | ||