diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2020-01-23 12:58:03 +0000 |
---|---|---|
committer | Brendan Abolivier <babolivier@matrix.org> | 2020-01-23 12:58:03 +0000 |
commit | ba64c3b615f8c636edfcd0914dcac14748d2ec5a (patch) | |
tree | 03ed148f29b9f2b6f69eff9f76172c8add756ae1 | |
parent | 1.9.0 (diff) | |
parent | Update admin room docs with correct endpoints (#6770) (diff) | |
download | synapse-ba64c3b615f8c636edfcd0914dcac14748d2ec5a.tar.xz |
Merge branch 'release-v1.9.0' of github.com:matrix-org/synapse into release-v1.9.0
Diffstat (limited to '')
-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 |