Mark Haines 784aaa53df Merge branch 'develop' into markjh/SYT-8-recaptcha ... Conflicts: synapse/handlers/auth.py		2015-05-29 13:49:44 +01:00
..
__init__.py	…
_base.py	…
admin.py	…
appservice.py	Remove unused import	2015-05-22 14:45:46 +01:00
auth.py	Merge branch 'develop' into markjh/SYT-8-recaptcha	2015-05-29 13:49:44 +01:00
directory.py	Disallow whitespace in aliases here too	2015-05-14 13:21:55 +01:00
events.py	…
federation.py	Actually fetch state for new backwards extremeties when backfilling.	2015-05-20 11:59:02 +01:00
identity.py	…
login.py	…
message.py	…
presence.py	Add a cache for getting the presence list for a user	2015-05-22 16:11:17 +01:00
profile.py	Treat setting your display name to the empty string as removing it (SYN-186).	2015-05-14 14:19:59 +01:00
register.py	…
room.py	Merge branch 'master' of github.com:matrix-org/synapse into develop	2015-05-22 10:33:00 +01:00
sync.py	…
typing.py	…