David Baker b56730bb6e Merge branch 'develop' into pushers ... Conflicts: synapse/api/errors.py synapse/server.py synapse/storage/__init__.py		2014-12-18 15:15:22 +00:00
..
__init__.py	Fix pep8 warnings	2014-10-30 11:10:17 +00:00
homeserver.py	Merge branch 'develop' into pushers	2014-12-18 15:15:22 +00:00
synctl.py	Fix pep8 codestyle warnings	2014-11-20 17:26:36 +00:00