2
0
mirror of https://github.com/acepanel/panel.git synced 2026-02-04 11:27:17 +08:00

Merge remote-tracking branch 'origin/main'

# Conflicts:
#	go.sum
This commit is contained in:
耗子
2024-11-29 18:47:24 +08:00
2 changed files with 5 additions and 5 deletions

2
go.mod
View File

@@ -42,7 +42,7 @@ require (
github.com/spf13/cast v1.7.0
github.com/stretchr/testify v1.10.0
github.com/tufanbarisyildirim/gonginx v0.0.0-20241115180907-128af6df1765
github.com/urfave/cli/v3 v3.0.0-alpha9.6
github.com/urfave/cli/v3 v3.0.0-alpha9.7
go.uber.org/zap v1.27.0
go.uber.org/zap/exp v0.3.0
golang.org/x/crypto v0.29.0

8
web/pnpm-lock.yaml generated
View File

@@ -67,7 +67,7 @@ importers:
version: 3.5.0
marked:
specifier: ^15.0.2
version: 15.0.2
version: 15.0.3
mitt:
specifier: ^3.0.1
version: 3.0.1
@@ -2569,8 +2569,8 @@ packages:
resolution: {integrity: sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==}
hasBin: true
marked@15.0.2:
resolution: {integrity: sha512-85RUkoYKIVB21PbMKrnD6aCl9ws+XKEyhJNMbLn206NyD3jbBo7Ec7Wi4Jrsn4dV1a2ng7K/jfkmIN0DNoS41w==}
marked@15.0.3:
resolution: {integrity: sha512-Ai0cepvl2NHnTcO9jYDtcOEtVBNVYR31XnEA3BndO7f5As1wzpcOceSUM8FDkNLJNIODcLpDTWay/qQhqbuMvg==}
engines: {node: '>= 18'}
hasBin: true
@@ -6297,7 +6297,7 @@ snapshots:
punycode.js: 2.3.1
uc.micro: 2.1.0
marked@15.0.2: {}
marked@15.0.3: {}
md-editor-v3@5.0.2(@codemirror/view@6.35.0)(@lezer/common@1.2.3)(vue@3.5.13(typescript@5.6.3)):
dependencies: