github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-27 07:44:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge with master

Browse Source
This commit is contained in:
ibuler
2017-01-07 22:34:12 +08:00
parent 9c6c6d6b4c 3da33a57e2
commit 49861b6a84
26 changed files with 2226 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/hands.py
View File

@@ -12,5 +12,5 @@
from users.utils import AdminUserRequiredMixin
from users.permissions import IsSuperUserOrAppUser, IsSuperUser
from users.permissions import IsAppUser, IsSuperUser
from users.models import User, UserGroup