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

Conflicts:
	docs/AddUserAsset.py

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

..

__init__.py

添加log models

2014-12-26 22:54:37 +08:00

AddUserAsset.py

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

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

developer_doc.txt

记录日志

2014-12-26 23:58:11 +08:00