Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking

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.