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		2014-06-17 10:12:44 +08:00
..
en.yml	Merge branch 'szzh' into CourseModify	2014-06-17 10:12:44 +08:00
zh.yml	Merge branch 'competition' into develop	2014-06-13 10:59:43 +08:00