Merge branch 'master' into typescript

# Conflicts:
#	bin/anyproxy
This commit is contained in:
砚然 2018-08-23 17:16:29 +08:00
commit 98264facde

View File

@ -1,6 +1,6 @@
{ {
"name": "anyproxy", "name": "anyproxy",
"version": "4.0.11", "version": "4.0.12",
"description": "A fully configurable HTTP/HTTPS proxy in Node.js", "description": "A fully configurable HTTP/HTTPS proxy in Node.js",
"main": "dist/proxy.js", "main": "dist/proxy.js",
"bin": { "bin": {