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
..
__init__.py	…
test_directory.py	…
test_federation.py	Fix ALL THE UNIT TESTS	2014-08-26 15:54:25 +01:00
test_presence.py	skip presence tests which broke when presence polling was disabled	2014-08-22 18:40:31 +01:00
test_presencelike.py	skip presence tests which broke when presence polling was disabled	2014-08-22 18:40:31 +01:00
test_profile.py	…
test_room.py	Merge branch 'develop' into storage_transactions	2014-08-26 16:07:05 +01:00