Merge remote-tracking branch 'origin/master' into 2.2

[github/wallabag/wallabag.git] / app / config / routing.yml

diff --git a/app/config/routing.yml b/app/config/routing.yml
index c491d35dc305eaa6f722bdd9a35251caf005aad3..750ed43568657bfa1b7b3a43988bac3b5e9f1f09 100644 (file)
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -1,7 +1,21 @@
+wallabag_annotation:
+  type : rest
+  resource: "@WallabagAnnotationBundle/Resources/config/routing_annotations.yml"
+
 wallabag_import:
     resource: "@WallabagImportBundle/Controller/"
-    type:     annotation
-    prefix:   /import
+    type: annotation
+    prefix: /import
+
+wallabag_user:
+    resource: "@WallabagUserBundle/Controller/"
+    type: annotation
+    prefix: /users
+
+wallabag_api:
+    resource: "@WallabagApiBundle/Controller/"
+    type: annotation
+    prefix: /
 
 wallabag_api:
     resource: "@WallabagApiBundle/Resources/config/routing.yml"