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
..
_activities.html.erb	first commit	2013-08-01 10:33:49 +08:00
_boards.html.erb	修改了一些新建、编辑权限	2013-11-26 16:27:56 +08:00
_issue_categories.html.erb	项目-设置-问题-居中;	2013-12-16 14:50:46 +08:00
_members.html.erb	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-09-15 10:58:14 +08:00
_modules.html.erb	first commit	2013-08-01 10:33:49 +08:00
_repositories.html.erb	修改contest中出现的逻辑错误	2014-10-23 11:30:34 +08:00
_versions.html.erb	#1247修复项目--配置--版本：新建版本，输入“wiki页面”为非汉字类型且字数较多时，显示异常的BUG	2014-10-22 16:08:47 +08:00
_wiki.html.erb	first commit	2013-08-01 10:33:49 +08:00