Paul "LeoNerd" Evans 1c51c8ab7d Merge remote-tracking branch 'origin/develop' into test-sqlite-memory ... Conflicts: synapse/storage/pdu.py		2014-09-12 17:20:06 +01:00
..
schema	Generate m.room.aliases event when the HS creates a room alias	2014-09-05 21:35:56 +01:00
__init__.py	Revert recent changes to RoomMemberStore	2014-09-12 15:51:51 +01:00
_base.py	Merge remote-tracking branch 'origin/develop' into test-sqlite-memory	2014-09-12 17:20:06 +01:00
directory.py	Generate m.room.aliases event when the HS creates a room alias	2014-09-05 21:35:56 +01:00
feedback.py	fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.	2014-09-03 17:31:57 +01:00
keys.py	fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.	2014-09-03 17:31:57 +01:00
pdu.py	Merge remote-tracking branch 'origin/develop' into test-sqlite-memory	2014-09-12 17:20:06 +01:00
presence.py	fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.	2014-09-03 17:31:57 +01:00
profile.py	fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.	2014-09-03 17:31:57 +01:00
registration.py	Add a .runInteraction() method on SQLBaseStore itself to wrap the .db_pool	2014-09-12 14:28:07 +01:00
room.py	Add a .runInteraction() method on SQLBaseStore itself to wrap the .db_pool	2014-09-12 14:28:07 +01:00
roommember.py	Merge remote-tracking branch 'origin/develop' into test-sqlite-memory	2014-09-12 17:20:06 +01:00
stream.py	Add a .runInteraction() method on SQLBaseStore itself to wrap the .db_pool	2014-09-12 14:28:07 +01:00
transactions.py	Add a .runInteraction() method on SQLBaseStore itself to wrap the .db_pool	2014-09-12 14:28:07 +01:00