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
..
assets	龚乐鑫修改意见1：去除无用文件	2014-10-15 09:21:51 +08:00
controllers	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-10-23 11:41:15 +08:00
helpers	修改contest中出现的逻辑错误	2014-10-23 11:30:34 +08:00
models	修改contest中出现的逻辑错误	2014-10-23 11:30:34 +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-10-23 11:41:15 +08:00