diff options
author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-12 17:20:06 +0100 |
---|---|---|
committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-12 17:20:06 +0100 |
commit | 1c51c8ab7d331f6be3a8fd14d6d1a40e0a2d3c29 (patch) | |
tree | 74528065c199aa426611c41a1351f54e35fa3f3a /synapse/app | |
parent | Initial hack at some RoomMemberStore unit tests (diff) | |
parent | Make the state resolution use actual power levels rather than taking them fro... (diff) | |
download | synapse-1c51c8ab7d331f6be3a8fd14d6d1a40e0a2d3c29.tar.xz |
Merge remote-tracking branch 'origin/develop' into test-sqlite-memory
Conflicts: synapse/storage/pdu.py
Diffstat (limited to 'synapse/app')
0 files changed, 0 insertions, 0 deletions