MetaCubeX 81c5a65f23 Merge remote-tracking branch 'Pro-Plus/with-tun' into Alpha ... # Conflicts: # README.md # adapter/outbound/trojan.go # adapter/outbound/vless.go # transport/trojan/trojan.go		2022-03-30 13:15:45 +08:00
..
inbound	[Fixed] Fixed clash process name is Clash.Meta	2022-02-04 17:38:06 +08:00
outbound	Merge remote-tracking branch 'Pro-Plus/with-tun' into Alpha	2022-03-30 13:15:45 +08:00
outboundgroup	[skip ci] [Pre] avoid npe	2022-03-23 13:48:21 +08:00
provider	Merge remote-tracking branch 'Pro-Plus/with-tun' into Alpha	2022-03-30 13:15:45 +08:00
adapter.go	Merge remote-tracking branch 'clash/dev' into Alpha	2022-03-17 01:41:51 +08:00
parser.go	Merge remote-tracking branch 'clash/dev' into Alpha	2022-03-17 01:41:51 +08:00