guanghongwei d8a6eba2f3 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei ... Conflicts: connect.py jumpserver.conf jumpserver/api.py		2015-03-21 13:10:38 +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	merge	2015-03-14 17:57:26 +08:00
tests.py	add new app juser,jasset	2014-12-22 17:18:51 +08:00
urls.py	bugs	2015-03-12 11:03:53 +08:00
views.py	zhoumo	2015-03-21 12:58:29 +08:00