diff options
author | Erik Johnston <erik@matrix.org> | 2021-07-09 11:26:17 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2021-07-09 11:26:17 +0100 |
commit | 251cfc4e09c36c87227771f1a3aa305c4b0a2121 (patch) | |
tree | aadcd7bfc13088274b812f3d48a935eb0b7d5c70 /docs/sample_config.yaml | |
parent | Upsert redactions in case they already exists (#10343) (diff) | |
parent | Fixup changelog (diff) | |
download | synapse-251cfc4e09c36c87227771f1a3aa305c4b0a2121.tar.xz |
Merge tag 'v1.38.0rc2' into develop
Synapse 1.38.0rc2 (2021-07-09) ============================== Bugfixes -------- - Fix bug where inbound federation in a room could be delayed due to not correctly dropping a lock. Introduced in v1.37.1. ([\#10336](https://github.com/matrix-org/synapse/issues/10336)) Improved Documentation ---------------------- - Update links to documentation in the sample config. Contributed by @dklimpel. ([\#10287](https://github.com/matrix-org/synapse/issues/10287)) - Fix broken links in [INSTALL.md](INSTALL.md). Contributed by @dklimpel. ([\#10331](https://github.com/matrix-org/synapse/issues/10331))
Diffstat (limited to 'docs/sample_config.yaml')
-rw-r--r-- | docs/sample_config.yaml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index cbbe7d58d9..a45732a246 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -8,7 +8,8 @@ # # It is *not* intended to be copied and used as the basis for a real # homeserver.yaml. Instead, if you are starting from scratch, please generate -# a fresh config using Synapse by following the instructions in INSTALL.md. +# a fresh config using Synapse by following the instructions in +# https://matrix-org.github.io/synapse/latest/setup/installation.html. # Configuration options that take a time period can be set using a number # followed by a letter. Letters have the following meanings: |