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.

alan b7a89d6108 Merge branch 'shaproup' into szzh ... Conflicts: app/models/course.rb app/models/project.rb app/views/contests/show_attendingcontest.html.erb app/views/files/_course_file.html.erb app/views/files/_course_new.html.erb app/views/layouts/_base_footer.html.erb Signed-off-by: alan <547533434@qq.com>		11 years ago
..
assets	龚乐鑫修改意见1：去除无用文件	11 years ago
controllers	《修改资料》页面：工作单位为不必填	11 years ago
helpers	Merge branch 'Homework' into szzh	11 years ago
models	Merge branch 'shaproup' into szzh	11 years ago
sweepers	first commit	12 years ago
views	Merge branch 'shaproup' into szzh	11 years ago