Merge branch 'dev' into new_dev

This commit is contained in:
ffdfgdfg authored and GitHub committed 2019-12-01 22:41:59 +08:00
commit 9abe5874b7
332 files changed
+3415 -63357

No files matched your search

+2
View File
@@ -0,0 +1,2 @@
# key -> user | value -> pwd
npc=npc.pwd
+1
View File
@@ -40,6 +40,7 @@ server_port=10000
[socks5]
mode=socks5
server_port=19009
multi_account=multi_account.conf
[file]
mode=file