diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-29 14:58:00 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-29 14:58:00 +0000 |
| commit | 396a67a09ad6217cab8010466d4f06ac897ad885 (patch) | |
| tree | cbe6996b8ad2b5560f17944625daedae8bf09285 /synapse/state.py | |
| parent | Use get_room_events_stream to get changes to the rooms if the number of chang... (diff) | |
| parent | Merge changes from develop (diff) | |
| download | synapse-396a67a09ad6217cab8010466d4f06ac897ad885.tar.xz | |
Merge branch 'client_v2_filter' into client_v2_sync
Conflicts: synapse/rest/client/v2_alpha/__init__.py
Diffstat (limited to 'synapse/state.py')
0 files changed, 0 insertions, 0 deletions