Erik Johnston bb4a20174c Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization ... Conflicts: synapse/federation/transport.py synapse/handlers/message.py		2014-10-27 10:20:44 +00:00
..
__init__.py	SYN-48: Implement WHOIS rest servlet	2014-09-29 14:59:52 +01:00
_base.py	Begin making auth use event.old_state_events	2014-10-15 16:06:59 +01:00
admin.py	SYN-48: Implement WHOIS rest servlet	2014-09-29 14:59:52 +01:00
directory.py	Begin making auth use event.old_state_events	2014-10-15 16:06:59 +01:00
events.py	Correctly handle the 'age' key in events and pdus	2014-09-15 13:26:11 +01:00
federation.py	It doesn't want a dict	2014-10-17 20:10:34 +01:00
login.py	Split PlainHttpClient into separate clients for talking to Identity servers and talking to Capatcha servers	2014-10-02 14:03:26 +01:00
message.py	Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization	2014-10-27 10:20:44 +00:00
presence.py	Fix race in presence handler where we evicted things from cache while handling a key therein	2014-09-08 11:28:50 +02:00
profile.py	Begin making auth use event.old_state_events	2014-10-15 16:06:59 +01:00
register.py	Add get_json method to 3pid http client. Better logging for errors in 3pid requests	2014-10-20 14:10:08 +01:00
room.py	Begin making auth use event.old_state_events	2014-10-15 16:06:59 +01:00
typing.py	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