summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-09-12 17:20:06 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-09-12 17:20:06 +0100
commit1c51c8ab7d331f6be3a8fd14d6d1a40e0a2d3c29 (patch)
tree74528065c199aa426611c41a1351f54e35fa3f3a /synapse/__init__.py
parentInitial hack at some RoomMemberStore unit tests (diff)
parentMake the state resolution use actual power levels rather than taking them fro... (diff)
downloadsynapse-1c51c8ab7d331f6be3a8fd14d6d1a40e0a2d3c29.tar.xz
Merge remote-tracking branch 'origin/develop' into test-sqlite-memory
Conflicts:
	synapse/storage/pdu.py
Diffstat (limited to 'synapse/__init__.py')
0 files changed, 0 insertions, 0 deletions