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.

yanxd d47facc9e8 Merge branch 'szzh' into develop ... Conflicts: app/views/contests/show_attendingcontest.html.erb db/schema.rb		11 years ago
..
environments	share completed with fq, xianbo	12 years ago
initializers	加入了对赞功能模块，同时预留了踩功能，但暂时不使用。	12 years ago
locales	Merge branch 'szzh' into develop	11 years ago
additional_environment.rb	Add sub-uri	12 years ago
additional_environment.rb.example	first commit	12 years ago
application.rb	0418	11 years ago
boot.rb	first commit	12 years ago
configuration.yml	fix setting about migrate path	12 years ago
configuration.yml.example	first commit	12 years ago
database.yml.example	fixtures fix, header fix dynamic.	11 years ago
environment.rb	1.添加部分默认数据	11 years ago
preinitializer.rb	first commit	12 years ago
routes.rb	Merge branch 'szzh' into develop	11 years ago
settings.yml	issues#377 074e8adf 引入的issue页面权限问题，除了控制器还修改过views判断语句 keyworks: @edit_allowed	11 years ago