summary refs log tree commit diff
path: root/res
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-07-24 09:57:05 +0100
committerGitHub <noreply@github.com>2018-07-24 09:57:05 +0100
commit536bc63a4e6833be9c8700f4382949238f8a4bf4 (patch)
tree5f804ee05b6472691cd12c5cb51d56453d5a367a /res
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/client_api... (diff)
parentMerge pull request #3584 from matrix-org/erikj/use_cached (diff)
downloadsynapse-536bc63a4e6833be9c8700f4382949238f8a4bf4.tar.xz
Merge branch 'develop' into erikj/client_apis_move
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions