ibuler c8d91884c8 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver ... Conflicts: jumpserver/api.py		2015-04-18 18:06:17 +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	hehe	2015-04-13 21:25:43 +08:00
tests.py	add new app juser,jasset	2014-12-22 17:18:51 +08:00
urls.py	bugs	2015-04-14 17:25:56 +08:00
views.py	Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver	2015-04-18 18:06:17 +08:00