diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-07-20 12:02:02 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-07-20 12:02:02 +0200 |
| commit | 0faeabefa7faedb3a6a3675a5e49e947554adae9 (patch) | |
| tree | e51ae7db64408b159b2dfa13bfa9e01530223dc9 /app/config/routing.yml | |
| parent | 2bb138ef6df2d1a608b42907185b274fb87f4513 (diff) | |
| parent | 317fc6e684356b645ea1327c2631c7d5fc193ddd (diff) | |
| download | wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.tar.gz wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.tar.zst wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.zip | |
Merge remote-tracking branch 'origin/master' into 2.1
Diffstat (limited to 'app/config/routing.yml')
| -rw-r--r-- | app/config/routing.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/config/routing.yml b/app/config/routing.yml index 6a6aa6ac..40cc7165 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml | |||
| @@ -4,8 +4,8 @@ wallabag_annotation: | |||
| 4 | 4 | ||
| 5 | wallabag_import: | 5 | wallabag_import: |
| 6 | resource: "@WallabagImportBundle/Controller/" | 6 | resource: "@WallabagImportBundle/Controller/" |
| 7 | type: annotation | 7 | type: annotation |
| 8 | prefix: /import | 8 | prefix: /import |
| 9 | 9 | ||
| 10 | wallabag_api: | 10 | wallabag_api: |
| 11 | resource: "@WallabagApiBundle/Resources/config/routing.yml" | 11 | resource: "@WallabagApiBundle/Resources/config/routing.yml" |