David Baker 5c6189ea3e Merge branch 'develop' into pushers ... Conflicts: synapse/rest/__init__.py		2015-01-22 17:46:16 +00:00
..
__init__.py	…
_base.py	Finish renaming "context" to "room_id" in federation codebase	2015-01-16 19:01:03 +00:00
admin.py	…
directory.py	…
events.py	Merge branch 'develop' into pushers	2015-01-22 17:46:16 +00:00
federation.py	Finish renaming "context" to "room_id" in federation codebase	2015-01-16 19:01:03 +00:00
login.py	…
message.py	…
presence.py	…
profile.py	…
register.py	…
room.py	…
typing.py	…