summaryrefslogtreecommitdiff
path: root/meetingtools/apps/auth
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2013-03-04 06:22:18 +0100
committerLeif Johansson <leifj@sunet.se>2013-03-04 06:22:18 +0100
commit2a82323101582ce11e19197b812143d01b6e820c (patch)
treeac075eb3c9bf9e6142f6257822dcc3dc63da64bd /meetingtools/apps/auth
parented0e7704e84e37819e10bf52f0a9827ee8c390dc (diff)
import cleanup
Diffstat (limited to 'meetingtools/apps/auth')
-rw-r--r--meetingtools/apps/auth/views.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/meetingtools/apps/auth/views.py b/meetingtools/apps/auth/views.py
index 551d9cd..807150c 100644
--- a/meetingtools/apps/auth/views.py
+++ b/meetingtools/apps/auth/views.py
@@ -8,14 +8,13 @@ from django.contrib.auth.models import User, Group
import datetime
from django.views.decorators.cache import never_cache
import logging
-from apps.room.tasks import import_user_rooms
-from apps.room.views import user_meeting_folder
+from meetingtools.apps.room.tasks import import_user_rooms
from meetingtools.apps.userprofile.models import UserProfile
from meetingtools.multiresponse import redirect_to, make_response_dict
from meetingtools.ac import ac_api_client
from django.shortcuts import render_to_response
from django.contrib import auth
-from django_co_connector.models import co_import_from_request, add_member,remove_member
+from django_co_connector.models import co_import_from_request, add_member, remove_member
from meetingtools.apps.cluster.models import acc_for_user
from django.conf import settings