diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-04-23 11:23:33 +0200 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-04-23 11:23:33 +0200 |
| commit | fb825759e3e176e14daf2d1a3afe69071ea76e6d (patch) | |
| tree | 162ef56256b7a652983d321b0e0d40194cc934d6 /synapse/config | |
| parent | Stop the master relaying USER_SYNC for other workers (#7318) (diff) | |
| parent | Revert "Merge pull request #7315 from matrix-org/babolivier/request_token" (diff) | |
| download | synapse-fb825759e3e176e14daf2d1a3afe69071ea76e6d.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/config')
0 files changed, 0 insertions, 0 deletions