alan 6e77c5a0b8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: app/controllers/my_controller.rb app/views/contestnotifications/index.html.erb app/views/courses/_join_private_course.html.erb app/views/wiki/edit.html.erb		2014-10-23 11:41:15 +08:00
..
en.yml	将上传资源权限从添加、编辑、缺陷及编辑缺陷注释权限中分离出来，修正未加入任何课程、项目的用户无法上传资源附件bug	2014-10-22 16:05:08 +08:00
zh.yml	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-10-23 11:41:15 +08:00