merge from branch luminous (version 1.5.4.2, ~r12561)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@12611 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-01-30 05:53:14 +00:00
parent 2263200ce4
commit cc47d2b247
196 changed files with 3655 additions and 2033 deletions

View file

@ -1,7 +0,0 @@
<load target="css/msignup.css" usecdn="true" />
<div>
<div class="hx h2"><h2>{$lang->cmd_find_member_account}</h2></div>
<p>{$lang->about_temp_password}</p>
<p><!--@if($identifier == 'user_id')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end-->: {$user_id}</p>
<p>{$lang->temp_password}: {$temp_password}</p>
</div>