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

Conflicts:
	synapse/handlers/events.py
	synapse/rest/events.py
	synapse/rest/room.py

1 files changed, 4 insertions, 0 deletions

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

index d974dbb374..e52d4ee69d 100644
--- a/docs/client-server/swagger_matrix/api-docs
+++ b/docs/client-server/swagger_matrix/api-docs
@@ -21,6 +21,10 @@
     {
       "path": "/presence",
       "description": "Presence operations"
+    },
+    {
+      "path": "/events",
+      "description": "Event operations"
     }
   ],
   "authorizations": {