diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-06-18 17:46:04 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-06-18 17:46:04 +0100 |
| commit | ef8415adc2bb14fce19bbe454357bef2b701eca2 (patch) | |
| tree | 313bf881fe0583a5129ed0e472667e6be566b6d4 /docs/workers.rst | |
| parent | fix changelog (diff) | |
| parent | Fix seven contrib files with Python syntax errors (#5446) (diff) | |
| download | synapse-ef8415adc2bb14fce19bbe454357bef2b701eca2.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/3pid_verification_logging github/dbkr/3pid_verification_logging dbkr/3pid_verification_logging
Diffstat (limited to 'docs/workers.rst')
| -rw-r--r-- | docs/workers.rst | 6 |
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:: |