lizanle 90661374a5 Merge branch 'szzh' into dev_zanle ... Conflicts: Gemfile app/controllers/projects_controller.rb config/locales/zh.yml		2015-01-23 10:33:07 +08:00
..
environments	Merge branch 'szzh' into dev_zanle	2015-01-23 10:33:07 +08:00
initializers	添加注释	2015-01-23 09:46:55 +08:00
locales	Merge branch 'szzh' into dev_zanle	2015-01-23 10:33:07 +08:00
additional_environment.rb	Add sub-uri	2013-08-11 15:05:55 +08:00
additional_environment.rb.example	first commit	2013-08-01 10:33:49 +08:00
application.rb	课程留言，发邮件给课程所有人	2015-01-21 11:33:29 +08:00
boot.rb	first commit	2013-08-01 10:33:49 +08:00
configuration.yml	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-01-22 21:02:53 +08:00
configuration.yml.example	first commit	2013-08-01 10:33:49 +08:00
database.yml.example	Signed-off-by: alan <547533434@qq.com>	2015-01-10 11:46:39 +08:00
environment.rb	修改contest中出现的逻辑错误	2014-10-23 11:30:34 +08:00
preinitializer.rb	first commit	2013-08-01 10:33:49 +08:00
routes.rb	Merge branch 'szzh' into dev_zanle	2015-01-23 10:33:07 +08:00
settings.yml	修改作业提交项目第一项为请选择	2014-11-25 10:35:43 +08:00