Merge branch 'develop' of github.com:matrix-org/synapse into room_config

8 files changed, 7 insertions, 7 deletions

diff --git a/docs/client-server/swagger_matrix/api-docs b/docs/client-server/swagger_matrix/api-docs

index 58462a9067..a80b3bb342 100644
--- a/docs/client-server/swagger_matrix/api-docs
+++ b/docs/client-server/swagger_matrix/api-docs
@@ -3,31 +3,31 @@
   "swaggerVersion": "1.2",
   "apis": [
     {
-      "path": "/login",
+      "path": "-login",
       "description": "Login operations"
     },
     {
-      "path": "/registration",
+      "path": "-registration",
       "description": "Registration operations"
     },
     {
-      "path": "/rooms",
+      "path": "-rooms",
       "description": "Room operations"
     },
     {
-      "path": "/profile",
+      "path": "-profile",
       "description": "Profile operations"
     },
     {
-      "path": "/presence",
+      "path": "-presence",
       "description": "Presence operations"
     },
     {
-      "path": "/events",
+      "path": "-events",
       "description": "Event operations"
     },
     {
-      "path": "/directory",
+      "path": "-directory",
       "description": "Directory operations"
     }
   ],
diff --git a/docs/client-server/swagger_matrix/directory b/docs/client-server/swagger_matrix/api-docs-directory

index 98109a0fbc..98109a0fbc 100644
--- a/docs/client-server/swagger_matrix/directory
+++ b/docs/client-server/swagger_matrix/api-docs-directory
diff --git a/docs/client-server/swagger_matrix/events b/docs/client-server/swagger_matrix/api-docs-events

index d22c68cc78..d22c68cc78 100644
--- a/docs/client-server/swagger_matrix/events
+++ b/docs/client-server/swagger_matrix/api-docs-events
diff --git a/docs/client-server/swagger_matrix/login b/docs/client-server/swagger_matrix/api-docs-login

index 8cc598b3c1..8cc598b3c1 100644
--- a/docs/client-server/swagger_matrix/login
+++ b/docs/client-server/swagger_matrix/api-docs-login
diff --git a/docs/client-server/swagger_matrix/presence b/docs/client-server/swagger_matrix/api-docs-presence

index d52ce2164a..d52ce2164a 100644
--- a/docs/client-server/swagger_matrix/presence
+++ b/docs/client-server/swagger_matrix/api-docs-presence
diff --git a/docs/client-server/swagger_matrix/profile b/docs/client-server/swagger_matrix/api-docs-profile

index 188259fa3d..188259fa3d 100644
--- a/docs/client-server/swagger_matrix/profile
+++ b/docs/client-server/swagger_matrix/api-docs-profile
diff --git a/docs/client-server/swagger_matrix/registration b/docs/client-server/swagger_matrix/api-docs-registration

index 2048aec1d2..2048aec1d2 100644
--- a/docs/client-server/swagger_matrix/registration
+++ b/docs/client-server/swagger_matrix/api-docs-registration
diff --git a/docs/client-server/swagger_matrix/rooms b/docs/client-server/swagger_matrix/api-docs-rooms

index 7d3341f097..7d3341f097 100644
--- a/docs/client-server/swagger_matrix/rooms
+++ b/docs/client-server/swagger_matrix/api-docs-rooms