diff options
author | Kegan Dougal <kegan@matrix.org> | 2014-08-26 10:04:26 +0100 |
---|---|---|
committer | Kegan Dougal <kegan@matrix.org> | 2014-08-26 10:04:26 +0100 |
commit | 52b64617f9b5e29a0e0aa4d524525e99501880c9 (patch) | |
tree | 01f40f3cddf1dc608f33efe7b34c95b88ac2bb62 /synapse/server.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into client_server_ur... (diff) | |
parent | Add 'state_key' to valid_keys (diff) | |
download | synapse-52b64617f9b5e29a0e0aa4d524525e99501880c9.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into client_server_url_rename
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions