summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-16 15:10:16 +0100
committerNeil Johnson <neil@matrix.org>2018-08-16 15:10:16 +0100
commitbfb6c586249069ccec46437536607fec3b2e4031 (patch)
tree41dcc4a5be007ec0ed7e3c4c271893eae022eb46 /changelog.d
parentcheck for room state before deciding on action (diff)
parentAdd GET media/v1/config (#3184) (diff)
downloadsynapse-bfb6c586249069ccec46437536607fec3b2e4031.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/3184.feature1
-rw-r--r--changelog.d/3589.feature1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/3184.feature b/changelog.d/3184.feature
new file mode 100644
index 0000000000..9f746a57a0
--- /dev/null
+++ b/changelog.d/3184.feature
@@ -0,0 +1 @@
+Add /_media/r0/config
diff --git a/changelog.d/3589.feature b/changelog.d/3589.feature
new file mode 100644
index 0000000000..a8d7124719
--- /dev/null
+++ b/changelog.d/3589.feature
@@ -0,0 +1 @@
+Add lazy-loading support to /messages as per MSC1227