Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	app/Locale/de_DE/translations.php

1 files changed, 4 insertions, 6 deletions

diff --git a/app/Template/config/board.php b/app/Template/config/board.php
index 19a4bcd7..f787a931 100644
--- a/app/Template/config/board.php
+++ b/app/Template/config/board.php
@@ -1,25 +1,23 @@
 <div class="page-header">
     <h2><?= t('Board settings') ?></h2>
 </div>
-<section>
 <form method="post" action="<?= $this->url->href('config', 'board') ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
     <?= $this->form->label(t('Task highlight period'), 'board_highlight_period') ?>
-    <?= $this->form->number('board_highlight_period', $values, $errors) ?><br/>
+    <?= $this->form->number('board_highlight_period', $values, $errors) ?>
     <p class="form-help"><?= t('Period (in second) to consider a task was modified recently (0 to disable, 2 days by default)') ?></p>
 
     <?= $this->form->label(t('Refresh interval for public board'), 'board_public_refresh_interval') ?>
-    <?= $this->form->number('board_public_refresh_interval', $values, $errors) ?><br/>
+    <?= $this->form->number('board_public_refresh_interval', $values, $errors) ?>
     <p class="form-help"><?= t('Frequency in second (60 seconds by default)') ?></p>
 
     <?= $this->form->label(t('Refresh interval for private board'), 'board_private_refresh_interval') ?>
-    <?= $this->form->number('board_private_refresh_interval', $values, $errors) ?><br/>
+    <?= $this->form->number('board_private_refresh_interval', $values, $errors) ?>
     <p class="form-help"><?= t('Frequency in second (0 to disable this feature, 10 seconds by default)') ?></p>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue">
     </div>
 </form>
-</section>
\ No newline at end of file