summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-04-23 11:23:33 +0200
committerBrendan Abolivier <babolivier@matrix.org>2020-04-23 11:23:33 +0200
commitfb825759e3e176e14daf2d1a3afe69071ea76e6d (patch)
tree162ef56256b7a652983d321b0e0d40194cc934d6 /synapse/rest
parentStop the master relaying USER_SYNC for other workers (#7318) (diff)
parentRevert "Merge pull request #7315 from matrix-org/babolivier/request_token" (diff)
downloadsynapse-fb825759e3e176e14daf2d1a3afe69071ea76e6d.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/rest')
0 files changed, 0 insertions, 0 deletions