Mark Haines 4b63b06cad Merge branch 'develop' into storage_transactions ... Conflicts: synapse/api/auth.py synapse/handlers/room.py synapse/storage/__init__.py		2014-08-26 16:07:05 +01:00
..
events	…
federation	…
handlers	Merge branch 'develop' into storage_transactions	2014-08-26 16:07:05 +01:00
rest	…
storage	…
util	…
__init__.py	…
test_distributor.py	…
test_state.py	…
test_types.py	…
utils.py	Merge branch 'develop' into storage_transactions	2014-08-26 16:07:05 +01:00