huang 7d87915413 Merge branch 'szzh' into dev_hjq ... Conflicts: app/helpers/application_helper.rb app/helpers/files_helper.rb app/views/courses/_course_members.html.erb app/views/courses/settings.html.erb app/views/homework_attach/_homework.html.erb public/javascripts/course.js public/stylesheets/courses.css public/stylesheets/public.css		2015-04-17 15:07:01 +08:00
..
mobile	Merge branch 'szzh' into dev_hjq	2015-04-17 15:07:01 +08:00