Administrator c289d6a4c5 Merge branch 'ansible_api' into ops_dev ... # Conflicts: # apps/jumpserver/urls.py # apps/locale/zh/LC_MESSAGES/django.po # apps/templates/_nav.html # requirements.txt # run_server.py		2016-11-24 17:57:50 +08:00
..
__init__.py	add asset add	2016-09-03 19:05:50 +08:00
settings.py	Merge branch 'ansible_api' into ops_dev	2016-11-24 17:57:50 +08:00
urls.py	Merge branch 'ansible_api' into ops_dev	2016-11-24 17:57:50 +08:00
views.py	add asset add	2016-09-03 19:05:50 +08:00
wsgi.py	Rename dir name dashboard to apps	2016-08-13 21:59:08 +08:00