diff options
| author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2017-01-27 09:34:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-27 09:34:32 +0100 |
| commit | 6fb06904ecde15b1b07d0a2af945338b416cf0e2 (patch) | |
| tree | e76f3e8142399316ec5660fab8c646b2c34b8336 /app/config/routing.yml | |
| parent | 05fa529bcfde01be5d320cb532900d72cf4b0830 (diff) | |
| parent | 78295b99dd1721c613f1ce52e2debbe6f6db7753 (diff) | |
| download | wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.tar.gz wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.tar.zst wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.zip | |
Merge pull request #2416 from wallabag/2.2
wallabag 2.2.0
Diffstat (limited to 'app/config/routing.yml')
| -rw-r--r-- | app/config/routing.yml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/config/routing.yml b/app/config/routing.yml index 750ed435..0bd2d130 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml | |||
| @@ -17,10 +17,6 @@ wallabag_api: | |||
| 17 | type: annotation | 17 | type: annotation |
| 18 | prefix: / | 18 | prefix: / |
| 19 | 19 | ||
| 20 | wallabag_api: | ||
| 21 | resource: "@WallabagApiBundle/Resources/config/routing.yml" | ||
| 22 | prefix: / | ||
| 23 | |||
| 24 | app: | 20 | app: |
| 25 | resource: "@WallabagCoreBundle/Controller/" | 21 | resource: "@WallabagCoreBundle/Controller/" |
| 26 | type: annotation | 22 | type: annotation |
| @@ -52,3 +48,6 @@ craue_config_settings_modify: | |||
| 52 | path: /settings | 48 | path: /settings |
| 53 | defaults: | 49 | defaults: |
| 54 | _controller: CraueConfigBundle:Settings:modify | 50 | _controller: CraueConfigBundle:Settings:modify |
| 51 | |||
| 52 | fos_js_routing: | ||
| 53 | resource: "@FOSJsRoutingBundle/Resources/config/routing/routing.xml" | ||