Merge remote-tracking branch 'fork/master' into dev

# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/docker.yml
#	.gitignore
#	base/pref.example.toml
#	base/snippets/emoji.toml
#	base/snippets/emoji.txt
#	scripts/build.macos.release.sh
#	scripts/build.windows.release.sh
#	scripts/rules_config.conf
#	src/generator/config/subexport.cpp
#	src/handler/interfaces.cpp
#	src/handler/settings.cpp
#	src/parser/config/proxy.h
#	src/parser/subparser.cpp
#	src/parser/subparser.h
#	src/utils/map_extra.h
#	src/version.h
This commit is contained in:
asdlokj1qpi23 committed 2025-03-25 14:08:43 +08:00
commit e88f8fd485
33 files changed
+887 -729

No files matched your search

+2
View File
@@ -7,3 +7,5 @@ scripts/quickjspp
scripts/yaml-cpp
.DS_Store
src/.DS_Store
build