diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-12-22 13:58:18 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-12-22 13:58:18 +0000 |
| commit | c058625959dd45f09f1838b4d7e98e4d73c193cf (patch) | |
| tree | be6fa0a73eebdb4b65b0e183d78130dc40923226 /scripts | |
| parent | Hook up read receipts and typing notifications for guest access (diff) | |
| parent | Merge pull request #454 from matrix-org/markjh/room_filtering (diff) | |
| download | synapse-c058625959dd45f09f1838b4d7e98e4d73c193cf.tar.xz | |
Merge remote-tracking branch 'origin/develop' into markjh/guest_access
Conflicts: synapse/api/filtering.py
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions