guanghongwei 9bab7bf1e7 Merge branch 'guanghongwei' of gitcafe.com:ibuler/jumpserver into guanghongwei ...

Conflicts:
	jperm/views.py
	jumpserver/views.py

2015-02-28 21:26:23 +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

�޸�������ʱ���ӳ�Ա

2015-01-28 15:08:16 +08:00

tests.py

add new app juser,jasset

2014-12-22 17:18:51 +08:00

urls.py

group_addʹ��ajax

2015-02-01 23:03:28 +08:00

views.py

Merge branch 'guanghongwei' of gitcafe.com:ibuler/jumpserver into guanghongwei

2015-02-28 21:26:23 +08:00