Merge remote-tracking branch 'origin/upstream/main'

2025-11-09 18:23:40 +08:00 · 2024-07-23 01:14:23 +00:00
parent 5aa26d691c c936198ac8
commit 4c96688e7c
22 changed files with 352 additions and 145 deletions
--- a/web/berry/src/constants/ChannelConstants.js
+++ b/web/berry/src/constants/ChannelConstants.js
@@ -167,6 +167,12 @@ export const CHANNEL_OPTIONS = {
    value: 42,
    color: 'primary'
  },
+  43: {
+    key: 43,
+    text: 'Proxy',
+    value: 43,
+    color: 'primary'
+  },
  41: {
    key: 41,
    text: 'Novita',