7 Commits

Author	SHA1	Message	Date
Mark Haines	db9ce032a4	Fix pep8 codestyle warnings	2014-11-20 17:26:36 +00:00
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
Mark Haines	b29517bd01	Add a request-id to each log line	2014-10-30 01:21:33 +00:00
Erik Johnston	53216a500d	Add a run_on_reactor function	2014-10-29 17:02:22 +00:00
Matthew Hodgson	8a7c1d6a00	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
Matthew Hodgson	f98e6380f1	add in whitespace after copyright statements to improve legibility	2014-08-13 03:14:34 +01:00
matrix.org	4f475c7697	Reference Matrix Home Server	2014-08-12 15:10:52 +01:00