huang 6b4b87ed09 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh ... Conflicts: app/views/organizations/_org_left_subfield_list.html.erb 处理冲突		2015-12-29 18:14:22 +08:00
..
api/mobile	首页动态优化	2015-07-24 11:47:45 +08:00
assets	组织界面增加分栏	2015-12-04 17:34:48 +08:00
controllers	Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop	2015-12-29 18:13:15 +08:00
helpers	里程碑 添加 “已解决”，区分已解决和已关闭	2015-12-24 17:18:52 +08:00
models	Merge branch 'develop' into dev_hjq	2015-12-28 17:04:12 +08:00
services	修改密码导航栏错误	2015-12-11 17:56:26 +08:00
sweepers	…
tasks	修改发系统消息后跳转路劲	2015-09-11 09:45:28 +08:00
views	Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh	2015-12-29 18:14:22 +08:00