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.

nwb 099e8a0912 Merge branch 'szzh' into CourseModify ... Conflicts: app/controllers/application_controller.rb app/views/attachments/upload.js.erb app/views/courses/_homework_form.html.erb app/views/layouts/base_courses.html.erb app/views/users/_my_joinedcourse.html.erb db/schema.rb lib/redmine.rb lib/redmine/access_control.rb		11 years ago
..
javascripts	Merge branch 'szzh' into CourseModify	11 years ago
stylesheets	Merge branch 'szzh' into CourseModify	11 years ago