diff options
| author | Eric Eastwood <erice@element.io> | 2021-11-11 00:56:50 -0600 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2021-11-11 00:56:50 -0600 |
| commit | b559e2326b419b71bdbcf88ab35a6f3fbbea8219 (patch) | |
| tree | e3ef5d870af0ee1888a88201f888933dd9e1a2b4 /synapse/config/key.py | |
| parent | Only run the tests package to get streaming Complement output (diff) | |
| parent | Fix typos in the `username_available` admin API documentation. (#11286) (diff) | |
| download | synapse-b559e2326b419b71bdbcf88ab35a6f3fbbea8219.tar.xz | |
Merge branch 'develop' into madlittlemods/return-historical-events-in-order-from-backfill
Conflicts: synapse/rest/client/room_batch.py
Diffstat (limited to 'synapse/config/key.py')
0 files changed, 0 insertions, 0 deletions