Daniel Wagner-Hall 4d1ea40008 Merge branch 'develop' into redactyoself ... Conflicts: synapse/handlers/_base.py		2015-08-28 15:35:39 +01:00
..
__init__.py	…
_base.py	Merge branch 'develop' into redactyoself	2015-08-28 15:35:39 +01:00
admin.py	Remove completely unused concepts from codebase	2015-08-25 16:23:06 +01:00
appservice.py	…
auth.py	Merge erikj/user_dedup to develop	2015-08-26 13:42:45 +01:00
directory.py	…
events.py	Don't make pushers handle presence/typing events	2015-08-24 16:19:43 +01:00
federation.py	…
identity.py	…
message.py	Remove completely unused concepts from codebase	2015-08-25 16:23:06 +01:00
presence.py	…
profile.py	…
receipts.py	…
register.py	Merge erikj/user_dedup to develop	2015-08-26 13:42:45 +01:00
room.py	…
sync.py	Fix up one more reference	2015-08-25 16:37:37 +01:00
typing.py	Remove needless existence checks	2015-08-26 11:08:23 +01:00