Administrator 1bc88e5b11 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 18:22:36 +08:00
..
api	[future] 添加Cron相关的基础API框架	2016-11-22 10:41:18 +08:00
migrations	Add migrations	2016-10-02 22:13:08 +08:00
models	[future] 调整app架构	2016-11-22 23:02:12 +08:00
tasks	[future] 将Task移到一个包内管理	2016-11-23 11:45:50 +08:00
templates	[future] 调整app架构	2016-11-22 23:02:12 +08:00
tests	[future] 调整app架构	2016-11-22 23:02:12 +08:00
urls	Rename urls	2016-11-16 18:12:14 +08:00
utils	兼容py3测试	2016-11-24 17:10:43 +08:00
__init__.py	add asset add	2016-09-03 19:05:50 +08:00
apps.py	Rename dir name dashboard to apps	2016-08-13 21:59:08 +08:00
urls.py	Merge branch 'ansible_api' into ops_dev	2016-11-24 18:22:36 +08:00
views.py	[future] 将Task移到一个包内管理	2016-11-23 11:45:50 +08:00