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
..
assets	Update asset	2016-11-17 19:28:45 +08:00
audits	Rename urls	2016-11-16 18:12:14 +08:00
common	Update usergroup detail	2016-11-15 19:33:04 +08:00
fixtures	Merge with audits	2016-11-06 11:52:25 +08:00
jumpserver	Merge branch 'ansible_api' into ops_dev	2016-11-24 17:57:50 +08:00
locale/zh/LC_MESSAGES	添加作业中心i18n	2016-11-22 21:40:05 +08:00
media/avatar	add asset add	2016-09-03 19:05:50 +08:00
ops	Merge branch 'ansible_api' into ops_dev	2016-11-24 17:57:50 +08:00
perms	Rename urls	2016-11-16 18:12:14 +08:00
static	prepare change api name	2016-11-16 17:38:03 +08:00
templates	Merge branch 'ansible_api' into ops_dev	2016-11-24 17:57:50 +08:00
terminal	Rename urls	2016-11-16 18:12:14 +08:00
users	Update asset	2016-11-17 19:28:45 +08:00
__init__.py	add asset add	2016-09-03 19:05:50 +08:00
manage.py	update	2016-09-04 07:04:15 +08:00