You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

huang 0a1aa9e569 Merge branch 'develop' into hjq_new_course ... Conflicts: db/schema.rb public/stylesheets/public.css		10 years ago
..
api/mobile	…
assets	组织界面增加分栏	10 years ago
controllers	修改课程删除后可以显示的问题	10 years ago
helpers	Merge branch 'develop' into hjq_new_course	10 years ago
models	Merge branch 'develop' into hjq_new_course	10 years ago
services	新建课程和课程配置页面增加结束学期	10 years ago
sweepers	…
tasks	…
views	Merge branch 'develop' into hjq_new_course	10 years ago