Tim 1658f78a7b Merge branch 'develop' into cs_optimize_txz ... Conflicts: app/views/layouts/new_base.html.erb app/views/layouts/new_base_user.html.erb app/views/users/_user_resource_info.html.erb		2016-07-05 15:38:56 +08:00
..
about_us.html.erb	css文件替换	2016-06-24 09:30:46 +08:00
agreement.html.erb	css文件替换	2016-06-24 09:30:46 +08:00
email_activation.html.erb	激活邮箱界面显示邮箱，激活邮箱界面留言太长不能留言解决	2016-07-01 15:49:25 +08:00
email_valid.html.erb	找回密码，邮件激活国际化	2015-01-31 10:48:09 +08:00
login.html.erb	Merge branch 'develop' into cs_optimize_txz	2016-07-05 15:38:56 +08:00
logout.html.erb	first commit	2013-08-01 10:33:49 +08:00
lost_password.html.erb	css文件替换	2016-06-24 09:30:46 +08:00
password_recovery.html.erb	密码重置	2015-08-27 15:15:06 +08:00