Merge remote-tracking branch 'upstream/main'

# Conflicts:
#	package.json
#	pnpm-lock.yaml
#	public/serverConfig.json
This commit is contained in:
valarchie
2023-07-07 18:17:47 +08:00
10 changed files with 378 additions and 408 deletions

View File

@@ -12,6 +12,7 @@ const include = [
"pinia",
"js-cookie",
"sortablejs",
"pinyin-pro",
"@vueuse/core",
"@pureadmin/utils",
"responsive-storage"