54 Commits (d9664344ecf481a73b2189f5bc65f4f784222969)

Author	SHA1	Message	Date
Erik Johnston	78015948a7	Initial implementation of auth conflict resolution	2015-01-29 16:52:33 +00:00
Mark Haines	5fed042640	Finish renaming "context" to "room_id" in federation codebase	2015-01-16 19:01:03 +00:00
Mark Haines	2408c4b0a4	Fold _do_request_for_transaction into the methods that called it since it was a trivial wrapper around client.get_json	2015-01-16 19:01:03 +00:00
Mark Haines	602684eac5	Split transport layer into client and server parts	2015-01-16 19:01:03 +00:00