sw b9031095d4 Merge branch 'szzh' into sw_new_course ... Conflicts: Gemfile app/controllers/courses_controller.rb app/views/attachments/_form.html.erb app/views/attachments/_form_course.html.erb app/views/files/_attachement_list.html.erb app/views/layouts/base.html.erb app/views/layouts/base_projects.html.erb config/locales/zh.yml public/javascripts/attachments.js		2015-03-27 14:13:49 +08:00
..
en.yml	附件上传国际化：修改页面一些bug：用户主页个人得分身份信息修改	2015-03-19 17:21:11 +08:00
zh.yml	Merge branch 'szzh' into sw_new_course	2015-03-27 14:13:49 +08:00