yanxd 70abac4c1e Merge branch 'competition' into develop ... Conflicts: app/controllers/application_controller.rb config/locales/en.yml config/locales/zh.yml db/schema.rb		2014-06-13 10:59:43 +08:00
..
assets	为竞赛通知添加评论	2014-06-05 10:28:36 +08:00
controllers	Merge branch 'competition' into develop	2014-06-13 10:59:43 +08:00
helpers	Merge branch 'competition' into develop	2014-06-13 10:59:43 +08:00
models	Merge branch 'competition' into develop	2014-06-13 10:59:43 +08:00
sweepers	first commit	2013-08-01 10:33:49 +08:00
views	Merge branch 'competition' into develop	2014-06-13 10:59:43 +08:00