github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'new_api' of github.com:jumpserver/jumpserver into new_api

pull/828/merge
ibuler 2017-12-15 18:56:21 +08:00
parent 5e1eff19b7 ef1bbc29b5
commit 0f64d39cc5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/jumpserver/settings.py
View File

@ -61,7 +61,7 @@ INSTALLED_APPS = [
'ops.apps.OpsConfig', 'ops.apps.OpsConfig',
# 'audits.apps.AuditsConfig', # 'audits.apps.AuditsConfig',
'common.apps.CommonConfig', 'common.apps.CommonConfig',
'terminal.apps.ApplicationsConfig', 'terminal.apps.TerminalConfig',
'rest_framework', 'rest_framework',
'rest_framework_swagger', 'rest_framework_swagger',
'django_filters', 'django_filters',

2
apps/terminal/apps.py
View File

@ -3,7 +3,7 @@ from __future__ import unicode_literals
from django.apps import AppConfig from django.apps import AppConfig
class ApplicationsConfig(AppConfig): class TerminalConfig(AppConfig):
name = 'terminal' name = 'terminal'
def ready(self): def ready(self):