diff options
| author | Paulino Michelazzo <paulino@michelazzo.com.br> | 2016-10-18 22:48:23 +0200 |
|---|---|---|
| committer | Paulino Michelazzo <paulino@michelazzo.com.br> | 2016-10-18 22:48:23 +0200 |
| commit | 99731f0bb1f6fd2815eeb9af504ce86df927657b (patch) | |
| tree | b080efc608d2bbd52b77a4a0067402007f50c5a8 /app/config/routing.yml | |
| parent | 3a3c6b866b52721431bed22426d9abfcd0d2dfe0 (diff) | |
| parent | 7180aaed45dce62e40620a9e4b202526ebd6a3bb (diff) | |
| download | wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.tar.gz wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.tar.zst wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.zip | |
Merge remote-tracking branch 'wallabag/master'
Diffstat (limited to 'app/config/routing.yml')
| -rw-r--r-- | app/config/routing.yml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/config/routing.yml b/app/config/routing.yml index 40cc7165..750ed435 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml | |||
| @@ -7,6 +7,16 @@ wallabag_import: | |||
| 7 | type: annotation | 7 | type: annotation |
| 8 | prefix: /import | 8 | prefix: /import |
| 9 | 9 | ||
| 10 | wallabag_user: | ||
| 11 | resource: "@WallabagUserBundle/Controller/" | ||
| 12 | type: annotation | ||
| 13 | prefix: /users | ||
| 14 | |||
| 15 | wallabag_api: | ||
| 16 | resource: "@WallabagApiBundle/Controller/" | ||
| 17 | type: annotation | ||
| 18 | prefix: / | ||
| 19 | |||
| 10 | wallabag_api: | 20 | wallabag_api: |
| 11 | resource: "@WallabagApiBundle/Resources/config/routing.yml" | 21 | resource: "@WallabagApiBundle/Resources/config/routing.yml" |
| 12 | prefix: / | 22 | prefix: / |