huang 0a1aa9e569 Merge branch 'develop' into hjq_new_course ... Conflicts: db/schema.rb public/stylesheets/public.css		2016-01-06 09:27:00 +08:00
..
api/mobile	…
assets	组织界面增加分栏	2015-12-04 17:34:48 +08:00
controllers	修改课程删除后可以显示的问题	2016-01-04 17:08:15 +08:00
helpers	Merge branch 'develop' into hjq_new_course	2016-01-06 09:27:00 +08:00
models	Merge branch 'develop' into hjq_new_course	2016-01-06 09:27:00 +08:00
services	新建课程和课程配置页面增加结束学期	2015-12-31 11:12:09 +08:00
sweepers	…
tasks	修改发系统消息后跳转路劲	2015-09-11 09:45:28 +08:00
views	Merge branch 'develop' into hjq_new_course	2016-01-06 09:27:00 +08:00