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

Reference Matrix Home Server

2014-08-12 15:10:52 +01:00

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

Factor out some of the common homeserver setup code into a

2015-02-11 11:37:30 +00:00

test_federation.py

Factor out some of the common homeserver setup code into a

2015-02-11 11:37:30 +00:00

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

Factor out some of the common homeserver setup code into a

2015-02-11 11:37:30 +00:00

test_room.py

Factor out some of the common homeserver setup code into a

2015-02-11 11:37:30 +00:00

test_typing.py

Factor out some of the common homeserver setup code into a

2015-02-11 11:37:30 +00:00