Merge branch 'dev' into federate

2016-06-28 00:34:31 +02:00
parent 6d7300fe43 fc57288c30
commit 32b5627c38
28 changed files with 1472 additions and 779 deletions
--- a/cas_server/urls.py
+++ b/cas_server/urls.py
@ -14,7 +14,7 @@ from django.conf.urls import patterns, url
 from django.views.generic import RedirectView
 from django.views.decorators.debug import sensitive_post_parameters, sensitive_variables

-import views
+from cas_server import views

 urlpatterns = patterns(
    '',