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.

sw a3cbcdad51 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: db/schema.rb		11 years ago
..
environments	…
initializers	tt	11 years ago
locales	首页定制，是否显示课程，竞赛	11 years ago
additional_environment.rb	…
additional_environment.rb.example	…
application.rb	…
boot.rb	…
configuration.yml	1.修改邮件服务器配置	11 years ago
configuration.yml.example	…
database.yml.example	…
environment.rb	…
preinitializer.rb	…
routes.rb	1.修复竞赛作品每次修改之后，都会吧图片清空的BUG	11 years ago
settings.yml	首页定制，是否显示课程，竞赛	11 years ago