diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-11-03 17:31:17 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-11-03 17:31:17 +0000 |
| commit | a3bfef35fd5fc26723d377839e1200f2de733723 (patch) | |
| tree | 6315a13c38c7d55defff5b8674645d57b6ca47e3 /scripts | |
| parent | Include read receipts in v2 sync (diff) | |
| parent | Merge pull request #335 from matrix-org/markjh/room_tags (diff) | |
| download | synapse-a3bfef35fd5fc26723d377839e1200f2de733723.tar.xz | |
Merge branch 'develop' into markjh/v2_sync_receipts
Conflicts: synapse/handlers/sync.py
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions