3x-ui/web/service
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
..
config.json Merge remote-tracking branch 'base/main' into v2.5.2 2025-02-18 19:04:31 +01:00
inbound.go feature/9 2024-12-10 16:31:43 +03:00
outbound.go improved - message logs 2024-07-08 23:47:49 +02:00
panel.go improved - message logs 2024-07-08 23:47:49 +02:00
server.go Merge remote-tracking branch 'base/main' into v2.5.2 2025-02-18 19:04:31 +01:00
setting.go Merge remote-tracking branch 'base/main' into v2.5.2 2025-02-18 19:04:31 +01:00
tgbot.go hotfix / some fixes 2024-12-08 23:41:07 +03:00
user.go bug fix - remove secret 2024-03-12 20:45:44 +03:30
warp.go [warp] report error in change license 2024-12-03 23:01:32 +01:00
xray.go feature / 12 2024-12-13 01:43:33 +03:00
xray_setting.go [warp] enhanced + delete option 2024-07-15 00:21:54 +02:00