summary refs log tree commit diff
path: root/res
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-08-22 09:15:44 +0100
committerRichard van der Hoff <richard@matrix.org>2018-08-22 09:15:44 +0100
commit0d568ff4035993afd8141c4076093c7e409741cd (patch)
treedc1e5bef5d0b0ab85fad4527cc98a968e16f3476 /res
parentSplit the state_group_cache in two (#3726) (diff)
parentMerge pull request #3732 from matrix-org/rav/fix_gdpr_consent (diff)
downloadsynapse-0d568ff4035993afd8141c4076093c7e409741cd.tar.xz
Merge remote-tracking branch 'origin/release-v0.33.3' into develop
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions