diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-15 16:21:13 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-15 16:21:13 +0100 |
| commit | a17b371384ef5e09f20415258bdcb7ddd53ce20c (patch) | |
| tree | 5a355c437c0f2bafdace0b80d3d9f1984409b6a0 /synapse | |
| parent | PEP8 cleanups (diff) | |
| parent | Fix imsync's SELECT query to only find the rooms I'm actually joined in, not ... (diff) | |
| download | synapse-a17b371384ef5e09f20415258bdcb7ddd53ce20c.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts: synapse/storage/roommember.py
Diffstat (limited to 'synapse')
0 files changed, 0 insertions, 0 deletions