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
..
_form.html.erb	图标and页面不换行顶出边界	2014-01-09 16:57:28 +08:00
edit.html.erb	first commit	2013-08-01 10:33:49 +08:00
new.html.erb	图标and页面不换行顶出边界	2014-01-09 16:57:28 +08:00
quote.js.erb	first commit	2013-08-01 10:33:49 +08:00
show.html.erb	Merge branch 'szzh' into CourseModify	2014-06-17 10:12:44 +08:00