David Baker 5c6189ea3e Merge branch 'develop' into pushers ... Conflicts: synapse/rest/__init__.py		2015-01-22 17:46:16 +00:00
..
__init__.py	Update copyright notices	2015-01-06 13:21:39 +00:00
_base.py	Finish renaming "context" to "room_id" in federation codebase	2015-01-16 19:01:03 +00:00
admin.py	Update copyright notices	2015-01-06 13:21:39 +00:00
directory.py	Update copyright notices	2015-01-06 13:21:39 +00:00
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	Update copyright notices	2015-01-06 13:21:39 +00:00
message.py	Add raw query param for scrollback.	2015-01-08 14:37:55 +00:00
presence.py	Update copyright notices	2015-01-06 13:21:39 +00:00
profile.py	Merge branch 'erikj-perf' of github.com:matrix-org/synapse into develop	2015-01-06 14:45:57 +00:00
register.py	Update copyright notices	2015-01-06 13:21:39 +00:00
room.py	PEP8 and pyflakes warnings	2015-01-07 16:18:12 +00:00
typing.py	Don't try to cancel already-expired timers - SYN-230	2015-01-13 16:58:36 +00:00