diff options
author | Jason Robinson <jasonr@matrix.org> | 2021-01-25 15:55:54 +0200 |
---|---|---|
committer | Jason Robinson <jasonr@matrix.org> | 2021-01-25 15:55:54 +0200 |
commit | fe18882bb5759133b8921b74d29d4a1906a69655 (patch) | |
tree | bfb3ff30c09f50e0e8458eaff698d8509bf23496 /synapse/api | |
parent | Merge branch 'develop' into jaywink/admin-forward-extremities (diff) | |
parent | Merge tag 'v1.26.0rc2' into develop (diff) | |
download | synapse-fe18882bb5759133b8921b74d29d4a1906a69655.tar.xz |
Merge remote-tracking branch 'origin/develop' into jaywink/admin-forward-extremities
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions