diff options
| author | David Baker <dave@matrix.org> | 2018-10-09 18:04:21 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2018-10-09 18:04:21 +0100 |
| commit | b8d9e108be60b3d14a57238562bfb5f49781c2a6 (patch) | |
| tree | 7c7ed96ac22ab1c369c7d0f39043f2ca409c436c /synapse/server.py | |
| parent | Add changelog (diff) | |
| download | synapse-b8d9e108be60b3d14a57238562bfb5f49781c2a6.tar.xz | |
Fix mergefail
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions