ibuler f253d2ea69 Merge with master		2016-09-14 23:31:22 +08:00
..
assets	Merge with master	2016-09-14 23:31:22 +08:00
audits	add asset add	2016-09-03 19:05:50 +08:00
common	Finish permissin detail asset list and user list	2016-09-14 23:29:39 +08:00
fixtures	Merge branch 'master' of code.simcu.com:jumpserver/jumpserver	2016-09-12 15:36:13 +08:00
jumpserver	Merge with master	2016-09-14 23:31:22 +08:00
locale/zh/LC_MESSAGES	Asset group detail	2016-09-06 21:39:21 +08:00
media/avatar	add asset add	2016-09-03 19:05:50 +08:00
ops	add asset add	2016-09-03 19:05:50 +08:00
perms	Finish permissin detail asset list and user list	2016-09-14 23:29:39 +08:00
static	add assets manage Sweet Alert"	2016-09-14 15:51:09 +08:00
templates	Merge with master	2016-09-14 23:31:22 +08:00
users	Merge with master	2016-09-14 23:31:22 +08:00
webterminal	add asset add	2016-09-03 19:05:50 +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