Skip to content

J
jumpserver
Commit 25ce24a1 authored by guanghongwei's avatar guanghongwei
Browse files
Options

Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 

Conflicts:
	jasset/views.py
	jumpserver/views.py
parent b840db12
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
jasset/views.py
View file @ 25ce24a1
...@@ -7,10 +7,7 @@ from django.template import RequestContext ...@@ -7,10 +7,7 @@ from django.template import RequestContext
from django.shortcuts import render_to_response from django.shortcuts import render_to_response
from jasset.models import IDC, Asset, BisGroup, AssetAlias 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 jperm.models import Perm, SudoPerm
from jumpserver.views import pages
from jumpserver.api import * from jumpserver.api import *
cryptor = PyCrypt(KEY) cryptor = PyCrypt(KEY)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment