guanghongwei c9928fc1f9 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver ...

Conflicts:
	docs/AddUserAsset.py

2015-03-07 17:39:10 +08:00

..

templatetags

修改一些bug

2015-03-07 17:37:26 +08:00

__init__.py

Init project add LICENSE file

2014-12-21 22:13:04 +08:00

api.py

修改一些bug

2015-03-07 17:37:26 +08:00

context_processors.py

今天到此为止

2015-03-06 00:24:17 +08:00

settings.py

修改 用户左侧显示

2015-02-27 22:14:09 +08:00

urls.py

�޸ĺܶ�����

2015-03-04 18:20:03 +08:00

views.py

Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver

2015-03-07 17:39:10 +08:00

wsgi.py

Init project add LICENSE file

2014-12-21 22:13:04 +08:00