thinkjs/lib/config/extend.js
welefen e31a797985 Merge branch '3.0'
# Conflicts:
#	.gitignore
#	README.md
#	package.json
#	src/adapter/db/_parse.js
#	src/adapter/db/_parse_mongo.js
#	src/adapter/socket/postgresql.js
#	src/adapter/websocket/socket.io.js
#	src/config/db.js
#	src/config/env/development.js
#	src/config/package.js
#	src/controller/base.js
#	src/core/http.js
#	src/core/think.js
#	src/index.js
#	src/middleware/check_resource.js
#	src/middleware/output_resource.js
#	src/model/base.js
#	src/model/mongo.js
#	src/util/parallel_limit.js
#	src/util/validator.js
#	src/util/watch_compile.js
#	template/package_test_ts.json
#	template/package_ts.json
#	test/adapter/db/_parse.js
#	test/controller/base.js
#	test/core/http.js
#	test/core/think.js
#	test/model/base.js
#	test/util/watch_compile.js
2017-08-14 15:47:44 +08:00

2 lines
21 B
JavaScript