Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	gui/src/components/main_modals.vue
This commit is contained in:
DJ2LS 2024-01-12 23:06:18 +01:00
commit c5214bc083
2 changed files with 1 additions and 3 deletions

View file

@ -10,8 +10,7 @@ const state = useStateStore(pinia);
<div class="card w-100 h-100">
<div class="card-header p-0 mb-1">
<i class="bi bi-volume-up" style="font-size: 1rem"></i>&nbsp;
<strong>Audio</strong>
<strong>Audio</strong>
</div>
<div class="card-body pt-0 pb-0">
<div class="container-wide">

View file

@ -2,7 +2,6 @@
import { setActivePinia } from "pinia";
import pinia from "../../store/index";
setActivePinia(pinia);
</script>
<template>
<a