Mark Haines e903c941cb Merge branch 'develop' into request_logging ...

Conflicts:
	setup.py
	synapse/storage/_base.py
	synapse/util/async.py

2014-11-14 11:16:50 +00:00

..

__init__.py

Fix pep8 warnings

2014-10-30 11:10:17 +00:00

context_factory.py

Fix pep8 warnings

2014-10-30 11:10:17 +00:00

event_signing.py

Tidy up some of the unused sql tables

2014-11-10 10:31:00 +00:00

keyclient.py

Merge branch 'develop' into request_logging

2014-10-30 11:13:58 +00:00

keyring.py

Fix pep8 warnings

2014-10-30 11:10:17 +00:00