guanghongwei 25ce24a17d Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver ...

Conflicts:
	jasset/views.py
	jumpserver/views.py

2015-04-08 17:39:00 +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 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver

2015-04-08 17:39:00 +08:00