merge #2005-Basic-Header, resolve conflict

This commit is contained in:
ogerly 2022-07-05 11:14:21 +02:00
commit bccc52adef

View File

@ -43,7 +43,7 @@
</b-navbar> </b-navbar>
<div class="alertBox"> <div class="alertBox">
<b-alert show dismissible variant="light" class="nav-alert text-dark"> <b-alert show dismissible variant="light" class="nav-alert text-dark">
<!--Light Alert--> <small>{{ $t('1000thanks') }}</small>
</b-alert> </b-alert>
</div> </div>
</div> </div>