summary refs log tree commit diff
path: root/res
diff options
context:
space:
mode:
authorkaiyou <pierre@jaury.eu>2018-04-14 12:27:16 +0200
committerkaiyou <pierre@jaury.eu>2018-04-14 12:27:16 +0200
commit041b41a825e456db180a89a9e4df6ea9f3d01c5b (patch)
treedb669225768b3322fe4d63451fdd05799634599a /res
parentMerge remote-tracking branch 'upstream/master' into feat-dockerfile (diff)
parentMerge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse (diff)
downloadsynapse-041b41a825e456db180a89a9e4df6ea9f3d01c5b.tar.xz
Merge remote-tracking branch 'upstream/master' into feat-dockerfile
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions