Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs

This commit is contained in:
David Baker 2016-04-29 20:28:47 +01:00
commit 2df75de505

View File

@ -52,6 +52,7 @@ class PasswordRestServlet(RestServlet):
defer.returnValue((401, result))
user_id = None
requester = None
if LoginType.PASSWORD in result:
# if using password, they should also be logged in