Mark Haines a3bfef35fd Merge branch 'develop' into markjh/v2_sync_receipts ... Conflicts: synapse/handlers/sync.py		2015-11-03 17:31:17 +00:00
..
__init__.py	Add room context api	2015-10-28 13:45:56 +00:00
_base.py	Merge pull request #302 from matrix-org/daniel/3pidinvites	2015-10-16 15:23:30 +01:00
admin.py	…
appservice.py	…
auth.py	Add config for how many bcrypt rounds to use for password hashes	2015-10-16 14:52:08 +01:00
directory.py	…
events.py	Split the sections of EventStreamHandler.get_stream that handle presence	2015-10-09 19:13:08 +01:00
federation.py	Allow rejecting invites	2015-10-20 11:58:58 +01:00
identity.py	…
message.py	Store room tag content and return the content in the m.tag event	2015-11-02 15:11:31 +00:00
presence.py	Fix some races in the synapse presence handler caused by not yielding on deferreds	2015-10-09 19:59:50 +01:00
private_user_data.py	Inform the client of new room tags using v1 /events	2015-10-29 15:21:09 +00:00
profile.py	…
receipts.py	Fix receipts for room initial sync	2015-10-22 16:17:23 +01:00
register.py	…
room.py	Docs	2015-10-28 14:05:50 +00:00
search.py	Make search API honour limit set in filter	2015-10-29 16:17:47 +00:00
sync.py	Merge branch 'develop' into markjh/v2_sync_receipts	2015-11-03 17:31:17 +00:00
typing.py	…