summary refs log tree commit diff
path: root/changelog.d/7718.feature
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-06-25 09:39:01 +0100
committerErik Johnston <erik@matrix.org>2020-06-25 09:39:01 +0100
commitc16bb06d25d69b03e72921e28bc21671c8c1285a (patch)
tree7b4bb329a35d298d40a48cdab1558084be6e085b /changelog.d/7718.feature
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentYield during large v2 state res. (#7735) (diff)
downloadsynapse-c16bb06d25d69b03e72921e28bc21671c8c1285a.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'changelog.d/7718.feature')
-rw-r--r--changelog.d/7718.feature1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/7718.feature b/changelog.d/7718.feature
new file mode 100644

index 0000000000..17071b9ea9 --- /dev/null +++ b/changelog.d/7718.feature
@@ -0,0 +1 @@ +Media can now be marked as safe from quarantined.