Merge conflicts with master.

2026-05-05 08:31:00 -04:00 · 2016-01-05 17:24:13 +00:00
parent 4fcc4efea2 e1c2ba034d
commit ecc3485d72
7 changed files with 21 additions and 52 deletions
--- a/app/main/views/two_factor.py
+++ b/app/main/views/two_factor.py
@@ -1,5 +1,7 @@
+
 from flask import (
    render_template, redirect, jsonify, session, url_for)
+
 from flask_login import login_user

 from app.main import main