1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-11-17 18:06:15 -05:00
Commit Graph

9 Commits

Author SHA1 Message Date
Jebbs
9bbc3af6cd
Fix: config merger fixes (#2084) 2022-11-05 19:12:11 +08:00
世界
fc6ae4d4e7
Fix lint 2022-06-28 21:36:12 +08:00
Shelikhoo
3ef7feaeaf
update version: auto replacement to v5 path 2022-01-02 15:16:23 +00:00
Bo He
b057a37fd6
fix some typo (#1482) 2021-12-27 12:33:08 +08:00
Loyalsoldier
43447aa2e4
Chore: format code to fix lint (#1426) 2021-11-27 14:32:07 +08:00
Jebbs
2523d77919
improve commands
(rebased from ebbf31f07e)
2021-09-04 11:11:45 +01:00
Jebbs
ec1694beb1
fix commands issues (#492)
* fix api commands output

* remove unused code

* fix convert always has -r

* update merge err to locate failed file
2021-09-04 11:09:58 +01:00
Jebbs
557b0c3353
V5: YAML support (rebased from 9367e9b1f2) 2021-09-04 11:05:52 +01:00
Jebbs
8c78712841
v5: New multi-json loader (rebased from ff59bd37ce) 2021-09-04 11:05:20 +01:00