Kegan Dougal f9232c7917 Merge branch 'develop' into application-services-txn-reliability ... Conflicts: synapse/storage/appservice.py		2015-03-16 10:09:15 +00:00
..
__init__.py
test_appservice.py	Use seconds; start gluing in the AS scheduler into the AS handler.	2015-03-09 17:01:19 +00:00
test_directory.py
test_federation.py
test_presence.py	Fix tests	2015-03-09 17:01:11 +00:00
test_presencelike.py	Fix tests	2015-03-09 17:01:11 +00:00
test_profile.py
test_room.py
test_typing.py