diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-08 15:55:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-08 15:55:47 +0000 |
| commit | d2f3ef98ac21929805f63a8a4964c3b97a22d1e1 (patch) | |
| tree | 7eac0a444d3b04cb11d49a28b0d61a7c4f795d2d /synapse/api | |
| parent | Ability to disable client/server Synapse via conf toggle (diff) | |
| parent | Merge pull request #3662 from matrix-org/neilj/reserved_users (diff) | |
| download | synapse-d2f3ef98ac21929805f63a8a4964c3b97a22d1e1.tar.xz | |
Merge branch 'develop' into neilj/disable_hs
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions