guanghongwei 67f9aad1b9 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei ... Conflicts: docs/AddUserAsset.py		2015-03-07 15:33:06 +08:00
..
group_add.html	…
group_detail.html	dashboard and bugs	2015-03-05 18:46:12 +08:00
group_list.html	…
host_add.html	…
host_add_multi.html	…
host_edit.html	…
host_list.html	修改bug	2015-03-04 18:33:38 +08:00
host_search.html	dashboard and bugs	2015-03-05 18:46:12 +08:00
idc_add.html	…
idc_detail.html	dashboard and bugs	2015-03-05 18:46:12 +08:00
idc_list.html	修改bug	2015-03-04 18:33:38 +08:00
jasset.html	…
jlist_ip.html	完工，睡觉	2015-03-07 00:12:38 +08:00
test.html	…