diff options
author | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-24 22:31:25 -0400 |
---|---|---|
committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-24 22:31:25 -0400 |
commit | c40d7244f8e07538a7ab25c255e803bc54fb7cb3 (patch) | |
tree | a502c6063ce25bb2ddaa479a7ce64d705e52b261 /changelog.d/6168.bugfix | |
parent | don't error if federation query doesn't have cross-signing keys (diff) | |
parent | Merge pull request #6248 from matrix-org/erikj/move_schema_files (diff) | |
download | synapse-c40d7244f8e07538a7ab25c255e803bc54fb7cb3.tar.xz |
Merge branch 'develop' into cross-signing_federation
Diffstat (limited to 'changelog.d/6168.bugfix')
-rw-r--r-- | changelog.d/6168.bugfix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/6168.bugfix b/changelog.d/6168.bugfix deleted file mode 100644 index 39e8e9d019..0000000000 --- a/changelog.d/6168.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix monthly active user reaping where reserved users are specified. |