diff options
author | Erik Johnston <erik@matrix.org> | 2016-03-18 14:47:19 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-03-18 14:47:19 +0000 |
commit | 8595ff7842ec08e6e246e99cb3205e67d7a5b144 (patch) | |
tree | 32142838794cb446c581a954d5bea5a044b8a5eb /synapse/util | |
parent | Don't assume existence of event_id in __str__ (diff) | |
parent | Merge pull request #652 from matrix-org/erikj/delete_alias (diff) | |
download | synapse-8595ff7842ec08e6e246e99cb3205e67d7a5b144.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/get_event
Diffstat (limited to 'synapse/util')
0 files changed, 0 insertions, 0 deletions