huang 165d5f50c8 Merge branch 'develop' into hjq_new_course ... Conflicts: app/controllers/files_controller.rb db/schema.rb 处理冲突		2016-01-13 13:01:26 +08:00
..
api/mobile	首页动态优化	2015-07-24 11:47:45 +08:00
assets	增加组织/个人屏蔽项目/课程动态功能	2016-01-08 14:12:55 +08:00
controllers	Merge branch 'develop' into hjq_new_course	2016-01-13 13:01:26 +08:00
helpers	提交总数接口获取修改	2016-01-12 11:01:58 +08:00
models	Merge branch 'develop' into hjq_new_course	2016-01-13 13:01:26 +08:00
services	复制学期时密码修改无效	2016-01-08 16:20:14 +08:00
sweepers	…
tasks	修改发系统消息后跳转路劲	2015-09-11 09:45:28 +08:00
views	Merge branch 'develop' into hjq_new_course	2016-01-13 13:01:26 +08:00