diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-17 12:44:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-17 12:44:26 +0000 |
| commit | 69c49d3fa3dc91ff6cbbadb52dc14e60cb063ecc (patch) | |
| tree | a2a6e5b2b873ffb119d6124e4b9feae56bc22bbd /changelog.d | |
| parent | add new error type ResourceLimit (diff) | |
| parent | Merge pull request #3708 from matrix-org/neilj/resource_Limit_block_event_cre... (diff) | |
| download | synapse-69c49d3fa3dc91ff6cbbadb52dc14e60cb063ecc.tar.xz | |
Merge branch 'develop' into neilj/limit_exceeded_error
Diffstat (limited to 'changelog.d')
| -rw-r--r-- | changelog.d/3705.bugfix | 1 | ||||
| -rw-r--r-- | changelog.d/3708.feature | 1 | ||||
| -rw-r--r-- | changelog.d/3712.misc | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/changelog.d/3705.bugfix b/changelog.d/3705.bugfix new file mode 100644 index 0000000000..6c5422994f --- /dev/null +++ b/changelog.d/3705.bugfix @@ -0,0 +1 @@ +Support more federation endpoints on workers diff --git a/changelog.d/3708.feature b/changelog.d/3708.feature new file mode 100644 index 0000000000..2f146ba62b --- /dev/null +++ b/changelog.d/3708.feature @@ -0,0 +1 @@ +For resource limit blocked users, prevent writing into rooms diff --git a/changelog.d/3712.misc b/changelog.d/3712.misc new file mode 100644 index 0000000000..30f8c2af21 --- /dev/null +++ b/changelog.d/3712.misc @@ -0,0 +1 @@ +Update admin register API documentation to reference a real user ID. |