Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 13:46:02 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into refresh

Browse source 
Conflicts:
	synapse/rest/client/v1/login.py
This commit is contained in:
Daniel Wagner-Hall 2015-08-20 16:25:40 +01:00
commit e8cf77fa49
19 changed files with 498 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

2
synapse/handlers/auth.py
View file

@ -163,7 +163,7 @@ class AuthHandler(BaseHandler):
if not user_id.startswith('@'):
user_id = UserID.create(user_id, self.hs.hostname).to_string()
self._check_password(user_id, password)
yield self._check_password(user_id, password)
defer.returnValue(user_id)
@defer.inlineCallbacks