sw 889af8be5f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: app/views/courses/_course_form.html.erb		2014-08-23 13:52:49 +08:00
..
assets	Merge branch 'szzh' into CourseModify	2014-06-17 10:12:44 +08:00
controllers	#1457 修复课程开课日期无法修改的BUG	2014-08-23 09:21:03 +08:00
helpers	#1457 修复课程开课日期无法修改的BUG	2014-08-23 09:21:03 +08:00
models	添加竞赛通知标题长度限制	2014-08-21 17:09:35 +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-08-23 13:52:49 +08:00