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

# Conflicts:
#	gui/src/js/api.js
This commit is contained in:
DJ2LS 2023-11-09 22:12:06 +01:00
commit 55a17b793b
2 changed files with 0 additions and 3 deletions

View file

@ -1,7 +1,6 @@
<script setup lang="ts">
import { saveModemConfig } from "../js/api";
import { setActivePinia } from "pinia";
import pinia from "../store/index";
setActivePinia(pinia);

View file

@ -1,8 +1,6 @@
<script setup lang="ts">
import { saveModemConfig } from "../js/api";
import { setActivePinia } from "pinia";
import pinia from "../store/index";
setActivePinia(pinia);