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
..
environments	share completed with fq, xianbo	2013-10-21 08:57:55 +08:00
initializers	tt	2014-07-31 09:52:52 +08:00
locales	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-10-23 11:41:15 +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	0418	2014-04-18 10:46:29 +08:00
boot.rb	first commit	2013-08-01 10:33:49 +08:00
configuration.yml	1.修改邮件服务器配置	2014-07-29 17:47:20 +08:00
configuration.yml.example	first commit	2013-08-01 10:33:49 +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	修改contest中出现的逻辑错误	2014-10-23 11:30:34 +08:00
settings.yml	修改contest中出现的逻辑错误	2014-10-23 11:30:34 +08:00