root 244d0d2ba4 Merge branch 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei ...

Conflicts:
	jumpserver/templatetags/mytags.py
	juser/views.py

2015-01-21 23:05:42 +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

�޸������model

2015-01-10 13:35:56 +08:00

tests.py

add new app juser,jasset

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

urls.py

添加查看属组.html

2015-01-09 22:10:38 +08:00

views.py

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

2015-01-21 23:05:42 +08:00