60 Commits

Author	SHA1	Message	Date
Erik Johnston	fb233dc40b	Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federation-requests	2015-02-11 10:33:19 +00:00
Erik Johnston	dcf52469e8	Move time_bound_deferred into Clock	2015-02-11 10:25:06 +00:00
Erik Johnston	ef995e6946	Add looping_call to Clock	2015-02-09 14:47:59 +00:00
Mark Haines	adb04b1e57	Update copyright notices	2015-01-06 13:21:39 +00:00
Mark Haines	db9ce032a4	Fix pep8 codestyle warnings	2014-11-20 17:26:36 +00:00
Mark Haines	ca91bb2f7f	Sometimes there isn't a current logging context	2014-11-19 17:18:55 +00:00
Mark Haines	97c7c34f6f	Preserve logging context in a few more places, drop the logging context after it has been stashed to reduce potential for confusion	2014-11-19 16:37:43 +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