153 Commits (d9239b52571c7e07fa9b035de1ad46bb602ed163)

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	602684eac5	Split transport layer into client and server parts	2015-01-16 19:01:03 +00:00