summary refs log tree commit diff
path: root/README.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-05-14 11:31:38 +0100
committerErik Johnston <erik@matrix.org>2021-05-14 11:31:38 +0100
commit6942377f904593eed1a61d7fcb76927ccf0e31c6 (patch)
tree1238379e36e38151918465d1ba2bd92a1885f376 /README.rst
parentMerge branch 'release-v1.34.0' into matrix-org-hotfixes (diff)
parentMinor `@cachedList` enhancements (#9975) (diff)
downloadsynapse-6942377f904593eed1a61d7fcb76927ccf0e31c6.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'README.rst')
0 files changed, 0 insertions, 0 deletions