Shelikhoo 7259b3363b Merge branch 'master' into websockwt

2016-08-15 10:17:22 +08:00

..

command.go

rename VMessAccount to vmess.Account

2016-07-25 17:36:24 +02:00

config_json_test.go

use server spec in vmess

2016-07-25 16:48:09 +02:00

config_json.go

update server

2016-08-14 22:08:23 +02:00

config.go

use server spec in vmess

2016-07-25 16:48:09 +02:00

outbound.go

Merge branch 'master' into websockwt

2016-08-15 10:17:22 +08:00