Mark Haines 7c06399512 Merge branch 'develop' into request_logging ... Conflicts: synapse/config/logger.py		2014-10-30 11:13:58 +00:00
..
__init__.py	fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.	2014-09-03 17:31:57 +01:00
async.py	Add a request-id to each log line	2014-10-30 01:21:33 +00:00
distributor.py	Fix pep8 warnings	2014-10-30 11:10:17 +00:00
emailutils.py	Fix pep8 warnings	2014-10-30 11:10:17 +00:00
jsonobject.py	Fix pep8 warnings	2014-10-30 11:10:17 +00:00
lockutils.py	fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.	2014-09-03 17:31:57 +01:00
logcontext.py	Pep8 and a few doc strings	2014-10-30 10:13:46 +00:00
logutils.py	Add a request-id to each log line	2014-10-30 01:21:33 +00:00
stringutils.py	fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.	2014-09-03 17:31:57 +01:00