summary refs log tree commit diff
path: root/docs/workers.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-04-15 18:56:46 +0100
committerErik Johnston <erik@matrix.org>2019-04-15 18:56:46 +0100
commit42ce90c3f70a73c84b61844f1f71edc632031a2c (patch)
treeafc4b166c65533a95ade90ffa827da728bf0c198 /docs/workers.rst
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentOnly handle GET requests for /push_rules (diff)
downloadsynapse-42ce90c3f70a73c84b61844f1f71edc632031a2c.tar.xz
Merge branch 'erikj/move_endpoints' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'docs/workers.rst')
-rw-r--r--docs/workers.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/workers.rst b/docs/workers.rst

index d80fc04d2e..aa4e7a120b 100644 --- a/docs/workers.rst +++ b/docs/workers.rst
@@ -227,6 +227,12 @@ following regular expressions:: ^/_matrix/client/(api/v1|r0|unstable)/account/3pid$ ^/_matrix/client/(api/v1|r0|unstable)/keys/query$ ^/_matrix/client/(api/v1|r0|unstable)/keys/changes$ + ^/_matrix/client/versions$ + ^/_matrix/client/(api/v1|r0|unstable)/voip/turnServer$ + +Additionally, the following REST endpoints can be handled for GET requests:: + + ^/_matrix/client/(api/v1|r0|unstable)/pushrules/.*$ Additionally, the following REST endpoints can be handled, but all requests must be routed to the same instance::