summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-03-18 14:47:19 +0000
committerErik Johnston <erik@matrix.org>2016-03-18 14:47:19 +0000
commit8595ff7842ec08e6e246e99cb3205e67d7a5b144 (patch)
tree32142838794cb446c581a954d5bea5a044b8a5eb /synapse/server.py
parentDon't assume existence of event_id in __str__ (diff)
parentMerge pull request #652 from matrix-org/erikj/delete_alias (diff)
downloadsynapse-8595ff7842ec08e6e246e99cb3205e67d7a5b144.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/get_event
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions