summary refs log tree commit diff
path: root/docker/conf
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2019-01-21 14:50:54 +0000
committerGitHub <noreply@github.com>2019-01-21 14:50:54 +0000
commit83f335bedf83c5b099d269b3ee241e7474bc1c57 (patch)
tree2c844b79665fc32b0bfc49285586394edf367131 /docker/conf
parentMerge pull request #4390 from matrix-org/erikj/versioned_fed_apis (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_v2_inv... (diff)
downloadsynapse-83f335bedf83c5b099d269b3ee241e7474bc1c57.tar.xz
Merge pull request #4402 from matrix-org/erikj/fed_v2_invite_server
Implement server side of MSC1794 - Federation v2 Invite API
Diffstat (limited to 'docker/conf')
0 files changed, 0 insertions, 0 deletions