Merge remote-tracking branch 'origin/master' into rustedbuilds

This commit is contained in:
jakedt 2014-02-24 16:11:33 -05:00
commit cbb1ab5e68

View file

@ -120,6 +120,11 @@ def get_user():
'username': get_authenticated_user().username, 'username': get_authenticated_user().username,
'email': get_authenticated_user().email, 'email': get_authenticated_user().email,
}) })
elif get_validated_token():
return jsonify({
'username': '$token',
'email': None,
})
abort(404) abort(404)