sw 218fb3f831 Merge remote-tracking branch 'origin/szzh' into szzh ... Conflicts: config/locales/zh.yml		2014-05-28 15:24:37 +08:00
..
migrate	1.修改判断当前用户是不是为课程老师的方法	2014-05-27 20:01:21 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	上传文件表单支持添加文件标签	2014-05-28 14:43:20 +08:00
schema.rb.orig	Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop	2014-05-23 09:49:36 +08:00