summary refs log tree commit diff
path: root/synapse/media
diff options
context:
space:
mode:
authorMathieu Velten <mathieuv@matrix.org>2023-05-09 19:42:57 +0200
committerMathieu Velten <mathieuv@matrix.org>2023-05-09 19:42:57 +0200
commit266d287165c9b7799c7cedc75606739b713cd9d6 (patch)
tree6a379292942a8c5af5668beed76b4b058481159f /synapse/media
parentError if attempting to set m.push_rules account data, per MSC4010. (#15555) (diff)
parent1.83.0 (diff)
downloadsynapse-266d287165c9b7799c7cedc75606739b713cd9d6.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/media')
0 files changed, 0 insertions, 0 deletions