diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2021-12-07 10:36:37 +0000 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2021-12-07 10:36:37 +0000 |
commit | c0b157dc9bcc88ea77704bc7b07c11e250212376 (patch) | |
tree | 87ba8914960c8d4d0351b9e329407c5e06956775 /changelog.d/11281.doc | |
parent | Modify tests to handle new location of to-device messages in AS txns (diff) | |
parent | Stabilise support for MSC2918 refresh tokens as they have now been merged int... (diff) | |
download | synapse-c0b157dc9bcc88ea77704bc7b07c11e250212376.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/e2e_as_to_device
Diffstat (limited to 'changelog.d/11281.doc')
-rw-r--r-- | changelog.d/11281.doc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/11281.doc b/changelog.d/11281.doc deleted file mode 100644 index ab27ed193c..0000000000 --- a/changelog.d/11281.doc +++ /dev/null @@ -1 +0,0 @@ -Suggest users of the Debian packages add configuration to `/etc/matrix-synapse/conf.d/` to prevent, upon upgrade, being asked to choose between their configuration and the maintainer's. |