diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-27 15:34:01 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-27 15:34:01 +0100 |
| commit | 08881d808d7cfd600d130eb7a960c6c51c797a09 (patch) | |
| tree | 1a8c8833a981b9a01e5f8c68c555203f2bc59455 /synapse/server.py | |
| parent | Index sources in a nicer fashion. (diff) | |
| parent | BF: use room_id if there is no alias (diff) | |
| download | synapse-08881d808d7cfd600d130eb7a960c6c51c797a09.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions