Mark Haines 2aeaa7b77c Merge branch 'develop' into storage_transactions ... Conflicts: synapse/handlers/room.py synapse/storage/stream.py		2014-08-27 17:15:58 +01:00
..
schema	…
__init__.py	…
_base.py	…
directory.py	…
feedback.py	…
pdu.py	…
presence.py	…
profile.py	…
registration.py	…
room.py	…
roommember.py	…
stream.py	Merge branch 'develop' into storage_transactions	2014-08-27 17:15:58 +01:00
transactions.py	…