cxt 62e28f638c Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course ... Conflicts: app/views/layouts/_course_base_info.html.erb app/views/layouts/base_projects.html.erb app/views/layouts/new_base_user.html.erb		2016-08-26 14:33:18 +08:00
..
api/mobile	班级问答区改成讨论区	2016-08-25 15:59:09 +08:00
assets	pull request页面删除	2016-08-01 16:57:55 +08:00
controllers	课程和项目的头像点击可编辑	2016-08-26 14:31:14 +08:00
helpers	普通作业和编程作业在题库发送后，编辑并进行发布，没有自动创建作品列表	2016-08-23 10:17:08 +08:00
models	取消收藏	2016-08-24 17:30:30 +08:00
services	Merge branch 'weixin_guange' into develop	2016-08-14 09:56:17 +08:00
sweepers	…
tasks	…
views	Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course	2016-08-26 14:33:18 +08:00