You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

alan 8c19ec8aa0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: app/helpers/projects_helper.rb app/views/contest_notification/show.html.erb Signed-off-by: alan <547533434@qq.com>		11 years ago
..
assets	Merge branch 'szzh' into CourseModify	12 years ago
controllers	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	11 years ago
helpers	将contest主页中通知公告的颜色改成蓝色	11 years ago
models	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	11 years ago
sweepers	first commit	13 years ago
views	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	11 years ago