104 Commits (91fa34b3fa93eded7aad45dcc44885124ad76960)

Author	SHA1	Message	Date
Erik Johnston	4ebbaf0d43	Blunty replace json with simplejson	2015-02-11 14:23:10 +00:00
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