serogaq 314f40a546 Merge remote-tracking branch 'base/main' into v2.5.2 ... # Conflicts: # DockerInit.sh # Dockerfile # README.md # README.ru_RU.md # README.zh_CN.md # docker-compose.yml # go.mod # web/assets/js/model/setting.js # web/html/xui/xray.html # web/service/setting.go		2025-02-18 19:04:31 +01:00
..
translate.en_US.toml	Merge remote-tracking branch 'base/main' into v2.5.2	2025-02-18 19:04:31 +01:00
translate.es_ES.toml	Merge remote-tracking branch 'base/main' into v2.5.2	2025-02-18 19:04:31 +01:00
translate.fa_IR.toml	Merge remote-tracking branch 'base/main' into v2.5.2	2025-02-18 19:04:31 +01:00
translate.id_ID.toml	Merge remote-tracking branch 'base/main' into v2.5.2	2025-02-18 19:04:31 +01:00
translate.ja_JP.toml	Merge remote-tracking branch 'base/main' into v2.5.2	2025-02-18 19:04:31 +01:00
translate.pt_BR.toml	Merge remote-tracking branch 'base/main' into v2.5.2	2025-02-18 19:04:31 +01:00
translate.ru_RU.toml	Merge remote-tracking branch 'base/main' into v2.5.2	2025-02-18 19:04:31 +01:00
translate.tr_TR.toml	Merge remote-tracking branch 'base/main' into v2.5.2	2025-02-18 19:04:31 +01:00
translate.uk_UA.toml	Merge remote-tracking branch 'base/main' into v2.5.2	2025-02-18 19:04:31 +01:00
translate.vi_VN.toml	Merge remote-tracking branch 'base/main' into v2.5.2	2025-02-18 19:04:31 +01:00
translate.zh_CN.toml	Merge remote-tracking branch 'base/main' into v2.5.2	2025-02-18 19:04:31 +01:00
translate.zh_TW.toml	Merge remote-tracking branch 'base/main' into v2.5.2	2025-02-18 19:04:31 +01:00