Commit Graph

7 Commits

Author SHA1 Message Date
guanghongwei
67f9aad1b9 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei
Conflicts:
	docs/AddUserAsset.py
2015-03-07 15:33:06 +08:00
guanghongwei
07b0e2980e 今天到此为止 2015-03-06 00:24:17 +08:00
root
e086a03692 bug 2015-03-04 23:14:07 +08:00
guanghongwei
50fcac67c3 修改 删除等 2015-03-03 22:44:00 +08:00
guanghongwei
fc007e96d7 ޸ĺܶ 2015-03-03 18:42:06 +08:00
guanghongwei
4190b19450 修改授权详情 2015-02-11 23:32:24 +08:00
guanghongwei
50208c0088 sudoȨ 2015-02-10 18:53:01 +08:00