Erik Johnston 347242a5c4 Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor ... Conflicts: tests/rest/test_presence.py tests/rest/test_rooms.py tests/utils.py		2014-08-19 14:48:19 +01:00
..
__init__.py	Make federation use resource_for_federation as well.	2014-08-14 10:05:06 +01:00
base.py	Added a urls module for keeping client and federation prefixes.	2014-08-14 11:52:56 +01:00
directory.py	Implement directory service federation by Federation Queries; avoid local_only hack; add unit tests	2014-08-13 18:03:41 +01:00
events.py	Update the default longpoll timeout time.	2014-08-18 14:30:07 +01:00
im.py	…
login.py	Pass back the user_id in the response to /login in case it has changed. Store and use that on the webclient rather than the input field.	2014-08-14 16:40:15 +01:00
presence.py	…
profile.py	…
public.py	…
register.py	…
room.py	Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor	2014-08-19 14:48:19 +01:00