fix conflicts

This commit is contained in:
Shpuld Shpuldson 2020-10-29 08:36:39 +02:00
commit cb3578fcca
123 changed files with 1685 additions and 1181 deletions

View file

@ -92,7 +92,11 @@
v-else
class="new-status-notification text-center panel-footer"
>
<i class="icon-spin3 animate-spin" />
<FAIcon
icon="circle-notch"
spin
size="lg"
/>
</div>
</div>
</div>