guanghongwei 419ee2660a Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei ... Conflicts: jumpserver/urls.py jumpserver/views.py		2015-04-09 11:32:32 +08:00
..
__init__.py	add new app juser,jasset	2014-12-22 17:18:51 +08:00
admin.py	add new app juser,jasset	2014-12-22 17:18:51 +08:00
models.py	修改bug，实时搜索完成	2015-04-07 19:15:45 +08:00
tests.py	add new app juser,jasset	2014-12-22 17:18:51 +08:00
urls.py	修改bug，实时搜索完成	2015-04-07 19:15:45 +08:00
views.py	Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei	2015-04-09 11:32:32 +08:00