Merge branch 'translate'

# Conflicts:
#	javascript/main.entry.js
#	javascript/main.entry.js.map
#	src/src/components/phystonPrompt.vue
#	src/src/mixins/languageMixin.js
#	styles/extensions/MyStyle-shuai/style.min.css


Former-commit-id: 990504338ee4ef499e5c8e4ed5f0bab5874fb333
This commit is contained in:
Physton
2023-05-23 22:58:11 +08:00
8 changed files with 115 additions and 190 deletions

View File

@@ -1 +1 @@
cdd208fd32e2e5bee52c0068e5edc389bf03d5dc
df986243a8cf1f5c9e6e56f0b63e8fdb0682dccc

View File

@@ -1 +1 @@
edb73e79bc2c27e94177ea278fb677a59384a9e6
11bd350050c74c0ef0158d0047c38cc1b56c65d4