github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-22 16:31:33 +00:00
Code Issues Projects Releases Wiki Activity

merge with cmdb

Browse Source
This commit is contained in:
ibuler
2015-11-15 19:57:25 +08:00
parent 0862ffef98 0f29745bfa
commit 3b07198b8a
29 changed files with 2794 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jumpserver/settings.py
View File

@@ -65,12 +65,12 @@ INSTALLED_APPS = (
'django.contrib.messages',
'django.contrib.staticfiles',
'django.contrib.humanize',
'bootstrapform',
'jumpserver',
'juser',
'jasset',
'jperm',
'jlog',
)
MIDDLEWARE_CLASSES = (
@@ -146,3 +146,5 @@ USE_TZ = False
# https://docs.djangoproject.com/en/1.7/howto/static-files/
STATIC_URL = '/static/'
BOOTSTRAP_COLUMN_COUNT = 10