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>		2014-09-15 10:58:14 +08:00
..
assets	Merge branch 'szzh' into CourseModify	2014-06-17 10:12:44 +08:00
controllers	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-09-15 10:58:14 +08:00
helpers	将contest主页中通知公告的颜色改成蓝色	2014-09-11 00:33:12 +08:00
models	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-09-15 10:58:14 +08:00
sweepers	first commit	2013-08-01 10:33:49 +08:00
views	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-09-15 10:58:14 +08:00