yumaojun03 046c7e21e9 Merge remote-tracking branch 'origin/master' into ops_dev ... # Conflicts: # requirements.txt		2016-12-19 23:55:54 +08:00
..
assets	add asset tool	2016-12-15 19:55:15 +08:00
audits	Update csv	2016-11-22 00:59:49 +08:00
common	Base finish user	2016-11-25 11:00:51 +08:00
fixtures	Add fake	2016-12-06 10:40:17 +08:00
jumpserver	Merge remote-tracking branch 'origin/master' into ops_dev	2016-12-19 23:55:54 +08:00
locale/zh/LC_MESSAGES	添加作业中心i18n	2016-11-22 21:40:05 +08:00
media	Update user import and export	2016-11-24 15:45:08 +08:00
ops	补充task需要的一些接口	2016-12-19 23:46:03 +08:00
perms	Rename urls	2016-11-16 18:12:14 +08:00
static	Merge remote-tracking branch 'origin/master' into ops_dev	2016-12-19 23:55:54 +08:00
templates	ansible Task接口更上层抽象的基本实现	2016-12-19 14:07:21 +08:00
terminal	Update import	2016-11-27 23:36:35 +08:00
users	add asset tool	2016-12-15 19:55:15 +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