sw 218fb3f831 Merge remote-tracking branch 'origin/szzh' into szzh ... Conflicts: config/locales/zh.yml		2014-05-28 15:24:37 +08:00
..
en.yml	Merge remote-tracking branch 'origin/szzh' into szzh	2014-05-28 15:24:37 +08:00
zh.yml	1.登录增加js提示可以用昵称和邮箱登录	2014-05-28 15:05:11 +08:00