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

add in whitespace after copyright statements to improve legibility

2014-08-13 03:14:34 +01:00

_base.py

add in whitespace after copyright statements to improve legibility

2014-08-13 03:14:34 +01:00

directory.py

Added a urls module for keeping client and federation prefixes.

2014-08-14 11:52:56 +01:00

events.py

add in whitespace after copyright statements to improve legibility

2014-08-13 03:14:34 +01:00

federation.py

add in whitespace after copyright statements to improve legibility

2014-08-13 03:14:34 +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

Round Presence mtime and mtime_age to nearest msec; avoids floats for msec values over the wire

2014-08-14 14:16:01 +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 'master' of github.com:matrix-org/synapse into sql_refactor

2014-08-15 11:50:14 +01:00