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
..
api/mobile	Merge branch 'szzh' into dev_hjq	2015-04-17 15:07:01 +08:00
assets	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-01-30 14:27:56 +08:00
controllers	Merge branch 'szzh' into dev_hjq	2015-04-17 15:07:01 +08:00
helpers	Merge branch 'szzh' into dev_hjq	2015-04-17 15:07:01 +08:00
models	Merge branch 'szzh' into dev_hjq	2015-04-16 10:26:03 +08:00
services	添加真名	2015-04-16 15:48:34 +08:00
sweepers	…
views	Merge branch 'szzh' into dev_hjq	2015-04-17 15:07:01 +08:00