huang 4b26e77478 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh ... Conflicts: app/models/issue.rb app/models/message.rb app/models/news.rb 处理冲突		2016-01-13 16:28:00 +08:00
..
api/mobile	首页动态优化	2015-07-24 11:47:45 +08:00
assets	增加组织/个人屏蔽项目/课程动态功能	2016-01-08 14:12:55 +08:00
controllers	Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh	2016-01-13 16:28:00 +08:00
helpers	Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh	2016-01-13 16:28:00 +08:00
models	Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh	2016-01-13 16:28:00 +08:00
services	复制学期时密码修改无效	2016-01-08 16:20:14 +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	2016-01-13 16:28:00 +08:00