diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2020-01-23 11:38:29 +0000 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-01-23 11:38:29 +0000 |
commit | 04345338e1bb26142a72ad4ddca78a03f41dc966 (patch) | |
tree | 6bd08ff4d2c7539a14bca578fc0db7a5489b5329 | |
parent | Remove unnecessary abstractions in admin handler (#6751) (diff) | |
parent | Update admin room docs with correct endpoints (#6770) (diff) | |
download | synapse-04345338e1bb26142a72ad4ddca78a03f41dc966.tar.xz |
Merge branch 'release-v1.9.0' into develop
-rw-r--r-- | changelog.d/6770.doc | 1 | ||||
-rw-r--r-- | docs/admin_api/rooms.md | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/changelog.d/6770.doc b/changelog.d/6770.doc new file mode 100644 |