Mark Haines 4b63b06cad Merge branch 'develop' into storage_transactions ... Conflicts: synapse/api/auth.py synapse/handlers/room.py synapse/storage/__init__.py		2014-08-26 16:07:05 +01:00
..
__init__.py	add in whitespace after copyright statements to improve legibility	2014-08-13 03:14:34 +01:00
_base.py	Wait for getting a Join in response to an invite/join dance.	2014-08-21 14:38:22 +01:00
directory.py	Added a urls module for keeping client and federation prefixes.	2014-08-14 11:52:56 +01:00
events.py	Start chagning the events stream to work with the new DB schema	2014-08-15 13:58:28 +01:00
federation.py	Fix pyflakes errors	2014-08-26 16:02:59 +01:00
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	Fix pyflakes errors	2014-08-26 16:02:59 +01:00
profile.py	Now that HS->HS Profile lookups use Federation Queries, we don't need the 'local_only' antirecursion hack	2014-08-13 17:23:49 +01:00
register.py	add in whitespace after copyright statements to improve legibility	2014-08-13 03:14:34 +01:00
room.py	Merge branch 'develop' into storage_transactions	2014-08-26 16:07:05 +01:00