summary refs log tree commit diff
path: root/docs/federate.md
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2019-05-13 15:54:25 +0100
committerDavid Baker <dave@matrix.org>2019-05-13 15:54:25 +0100
commit516a5fb64b8f66c06b29c87b9903db328c898582 (patch)
tree606e24b63e00b7bc7a7557eef8542d82de5d0640 /docs/federate.md
parentMerge remote-tracking branch 'origin/develop' into dbkr/add_dummy_flow_to_rec... (diff)
parentMerge pull request #5179 from matrix-org/babolivier/isort (diff)
downloadsynapse-516a5fb64b8f66c06b29c87b9903db328c898582.tar.xz
Merge remote-tracking branch 'origin/develop' into dbkr/add_dummy_flow_to_recaptcha_only
Diffstat (limited to 'docs/federate.md')
0 files changed, 0 insertions, 0 deletions