Merge pull request #7 from serghey-rodin/master

update from master
This commit is contained in:
myvesta 2018-06-01 16:54:20 +02:00 committed by GitHub
commit 0970485799
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
440 changed files with 25171 additions and 115 deletions

View file

@ -158,7 +158,7 @@
</tr>
<tr>
<td><?=__('Username')?>:</td>
<td><div><span id="v_account">william.cage</span>@<?=htmlentities(trim($v_domain, "'"))?></div></td>
<td><div><span id="v_account">example</span>@<?=htmlentities(trim($v_domain, "'"))?></div></td>
</tr>
<tr>
<td><?=__('Password')?>:</td>

View file

@ -165,7 +165,7 @@
</tr>
<tr>
<td><?=__('Username')?>:</td>
<td><div><span id="v_account">william.cage</span>@<?=htmlentities(trim($v_domain, "'"))?></div></td>
<td><div><span id="v_account">example</span>@<?=htmlentities(trim($v_domain, "'"))?></div></td>
</tr>
<tr>
<td><?=__('Password')?>:</td>