Merge branch 'master' into oauth_redirect

# Conflicts: # realms/modules/auth/views.py
2016-09-04 12:25:57 -04:00 · 2016-09-04 12:25:57 -04:00 · 2ce6c2d314
commit 2ce6c2d314
parent cb8c6fdaba a47d7e2471
41 changed files with 350 additions and 213 deletions
--- a/realms/modules/auth/ldap/models.py
+++ b/realms/modules/auth/ldap/models.py
@ -1,5 +1,5 @@
 from flask import render_template
-from flask.ext.login import login_user
+from flask_login import login_user
 from realms import ldap
 from flask_ldap_login import LDAPLoginForm
 from ..models import BaseUser