diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-10-09 19:18:09 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-10-09 19:18:09 +0100 |
commit | af7b21447648cba477542bc1786be2a6c0928e37 (patch) | |
tree | 74c4481acd515a180c0edeb05d1a03b52ba30fd6 /synapse/federation | |
parent | Format the presence events correctly for v2 (diff) | |
parent | Split the sections of EventStreamHandler.get_stream that handle presence (diff) | |
download | synapse-af7b21447648cba477542bc1786be2a6c0928e37.tar.xz |
Merge branch 'markjh/eventstream_presence' into markjh/v2_sync_api
Diffstat (limited to 'synapse/federation')
0 files changed, 0 insertions, 0 deletions