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

homeserver.py

Merge branch 'develop' into request_logging

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

synctl.py

SYN-138: Rewrite synctl in python and include it in the python distribution

2014-11-13 14:39:30 +00:00