From 25ce24a17d8688c4e24b8ac8f56f12da49cb8451 Mon Sep 17 00:00:00 2001 From: guanghongwei Date: Wed, 8 Apr 2015 17:39:00 +0800 Subject: [PATCH] Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver Conflicts: jasset/views.py jumpserver/views.py --- jasset/views.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/jasset/views.py b/jasset/views.py index 4807f6efb..3d1db5bfe 100644 --- a/jasset/views.py +++ b/jasset/views.py @@ -7,10 +7,7 @@ from django.template import RequestContext from django.shortcuts import render_to_response from jasset.models import IDC, Asset, BisGroup, AssetAlias -from juser.models import UserGroup, DEPT -from jumpserver.views import jasset_host_edit, pages from jperm.models import Perm, SudoPerm -from jumpserver.views import pages from jumpserver.api import * cryptor = PyCrypt(KEY)