summary refs log tree commit diff
path: root/res
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-03-14 09:40:57 +0000
committerGitHub <noreply@github.com>2018-03-14 09:40:57 +0000
commitcfe75a9fb64604dee1584390078d3a458f2144ca (patch)
tree20f2e576618c884cc14253fd0211482a0e248163 /res
parentMerge pull request #2993 from matrix-org/erikj/is_blocked (diff)
parent_remote_join and co take a requester (diff)
downloadsynapse-cfe75a9fb64604dee1584390078d3a458f2144ca.tar.xz
Merge pull request #2991 from matrix-org/erikj/fixup_rm
_remote_join and co take a requester
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions