yanxd d47facc9e8 Merge branch 'szzh' into develop ... Conflicts: app/views/contests/show_attendingcontest.html.erb db/schema.rb		2014-05-20 14:33:50 +08:00
..
en.yml	1.优化资源文件上传下载界面	2014-05-20 11:33:17 +08:00
zh.yml	Merge branch 'szzh' into develop	2014-05-20 14:33:50 +08:00