summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-15 16:21:13 +0100
committerErik Johnston <erik@matrix.org>2014-08-15 16:21:13 +0100
commita17b371384ef5e09f20415258bdcb7ddd53ce20c (patch)
tree5a355c437c0f2bafdace0b80d3d9f1984409b6a0 /synapse/storage
parentPEP8 cleanups (diff)
parentFix imsync's SELECT query to only find the rooms I'm actually joined in, not ... (diff)
downloadsynapse-a17b371384ef5e09f20415258bdcb7ddd53ce20c.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts:
	synapse/storage/roommember.py
Diffstat (limited to 'synapse/storage')
0 files changed, 0 insertions, 0 deletions