mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-08-31 15:11:27 +00:00
Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver
Conflicts: jasset/views.py jumpserver/views.py
This commit is contained in:
@@ -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)
|
||||
|
Reference in New Issue
Block a user