diff options
| author | Erik Johnston <erik@matrix.org> | 2021-07-23 09:03:19 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-07-23 09:03:19 +0100 |
| commit | 683deee9a4be8400e72bb2de87b82912656597ac (patch) | |
| tree | bedb7d836b7e395fb5cb59932f5586b7c90f6ab1 /synapse/api | |
| parent | Disable msc2716 until Complement update is merged (#10463) (diff) | |
| parent | Merge tag 'v1.38.1' (diff) | |
| download | synapse-683deee9a4be8400e72bb2de87b82912656597ac.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions