Merge branch 'master' into platform-admin

This commit is contained in:
Rebecca Law
2016-03-21 15:37:35 +00:00

View File

@@ -16,7 +16,6 @@ from app.main.forms import TwoFactorForm
@main.route('/two-factor', methods=['GET', 'POST'])
def two_factor():
# TODO handle user_email not in session
try:
user_id = session['user_details']['id']
except KeyError: