summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2020-09-11 07:34:53 -0400
committerPatrick Cloke <patrickc@matrix.org>2020-09-11 07:34:53 -0400
commit27ef82d972d990a4d5a3e3e44b3e2bf26d902ece (patch)
tree56a8fce88c93abc1deb5c9ebbf53e6fd94bb20e1 /docs
parentMerge branch 'release-v1.20.0' into matrix-org-hotfixes (diff)
parentFix the exception that is raised when invalid JSON is encountered. (#8291) (diff)
downloadsynapse-27ef82d972d990a4d5a3e3e44b3e2bf26d902ece.tar.xz
Merge remote-tracking branch 'origin/release-v1.20.0' into matrix-org-hotfixes
Diffstat (limited to 'docs')
-rw-r--r--docs/workers.md1
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/workers.md b/docs/workers.md

index 7a8f5c89fc..bfec745897 100644 --- a/docs/workers.md +++ b/docs/workers.md
@@ -380,7 +380,6 @@ Handles searches in the user directory. It can handle REST endpoints matching the following regular expressions: ^/_matrix/client/(api/v1|r0|unstable)/user_directory/search$ - ^/_matrix/client/unstable/uk.half-shot.msc2666/user/shared_rooms/.*$ When using this worker you must also set `update_user_directory: False` in the shared configuration file to stop the main synapse running background