Commit graph

2 commits

Author SHA1 Message Date
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
mhsanaei
04c6b2722b
README: Persian 2025-02-03 20:30:42 +01:00