wanglinchun 1e0e5a5ab1 Merge branch 'competition' into develop ... Conflicts: config/routes.rb		2014-05-10 11:28:37 +08:00
..
en.yml	异步验证注册字段合法	2014-05-10 09:22:45 +08:00
zh.yml	Merge branch 'competition' into develop	2014-05-10 11:28:37 +08:00