summary refs log tree commit diff
path: root/res
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-01-17 10:57:13 +0000
committerRichard van der Hoff <richard@matrix.org>2018-01-17 10:57:13 +0000
commit38506773ebfe4d3afefcb835eb891f13c943f8fa (patch)
treeb7432d12406c90f67309ca96495da7d767bc47ec /res
parentOptimise LoggingContext creation and copying (diff)
parentMerge pull request #2789 from matrix-org/erikj/fix_thumbnails (diff)
downloadsynapse-38506773ebfe4d3afefcb835eb891f13c943f8fa.tar.xz
Merge remote-tracking branch 'origin/develop' into rav/optimise_logging_context
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions