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

�޸�jpermistion --> jperm ����

2015-01-24 14:46:35 +08:00

admin.py

�޸�jpermistion --> jperm ����

2015-01-24 14:46:35 +08:00

models.py

������Ȩ����

2015-02-11 18:38:56 +08:00

tests.py

�޸�jpermistion --> jperm ����

2015-01-24 14:46:35 +08:00

urls.py

�޸ķ�ҳ

2015-02-15 10:06:02 +08:00

views.py

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

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