1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-07-01 19:45:24 +00:00
Commit Graph

9 Commits

Author SHA1 Message Date
Xiaokang Wang
61112d8af7
Workaround for muti-json's hard coded override method (#409)
* Simple workaround for muti-json unable to automatically understand new config options.

* Update jsonem.go
2020-11-21 02:50:46 +08:00
vcptr
0d71d3dcf8 revert back to multiconfig 2020-03-19 19:11:16 +08:00
Kslr
fdbec9a141
Revert "multiple config" 2020-01-02 01:23:56 +08:00
vcptr
f14eb97e3c rearrange loader 2019-12-16 10:22:17 +08:00
vcptr
75f0879c12 proper handle stdin 2019-12-14 23:48:56 +08:00
vcptr
1bb34bfe17 abstract type for conf load func 2019-12-14 23:48:56 +08:00
vcptr
1e76123a4c main loads multiple 2019-12-14 23:48:56 +08:00
Darien Raymond
4eb2b5e607
merge ext into core 2019-02-10 19:04:11 +01:00
Darien Raymond
97341693f3
add an option to include JSON loader in v2ray binary. 2018-04-22 22:54:27 +02:00