Merge branch 'develop' into feature/new-router

This commit is contained in:
slawkens
2022-10-28 17:33:22 +02:00
14 changed files with 54 additions and 56 deletions

View File

@@ -1,4 +1,4 @@
Please enter your password and the new email address. Make sure that you enter a valid email address which you have access to. <b>For security reasons, the actual change will be finalised after a waiting period of {{ config.account_mail_change }} days.</b><br/><br/>
Please enter your password and the new email address. Make sure that you enter a valid email address which you have access to. <br/><b>For security reasons, the actual change will be finalised after a waiting period of {{ config.account_mail_change }} days.</b><br/><br/>
<form action="{{ getLink('account/email') }}" method="post">
<div class="TableContainer">
<table class="Table1" cellpadding="0" cellspacing="0">

View File

@@ -227,7 +227,7 @@
{% if config.character_towns|length > 1 %}
<tr>
<td class="LabelV" style="width: 150px">
<span{% if errors.town is defined %} class="red"{% endif %}>Select your city:</span>
<span{% if errors.town is defined %} class="red"{% endif %}>Select your town:</span>
</td>
<td>
<table width="100%" >