Erik Johnston d72f897f07 Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor ... Conflicts: synapse/storage/stream.py		2014-08-15 11:50:14 +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	…
events.py	…
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	Start fixing places that use the data store.	2014-08-14 17:34:37 +01:00