Commit 02a23488 authored by nanahira's avatar nanahira

merge

parents a143f660 bd62cf57
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"srvpro", "srvpro",
"server" "server"
], ],
"author": "zh99998 <zh99998@gmail.com>, mercury233 <me@mercury233.me>", "author": "zh99998 <zh99998@gmail.com>, mercury233 <me@mercury233.me>, Nanahira <78877@qq.com>",
"dependencies": { "dependencies": {
"bunyan": "latest", "bunyan": "latest",
"deepmerge": "latest", "deepmerge": "latest",
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
"sqlite3": "latest", "sqlite3": "latest",
"geoip-country-lite": "latest", "geoip-country-lite": "latest",
"challonge": "latest", "challonge": "latest",
"ws": "latest" "pg": "^6.4.2",
"ws": "^6.0.0"
}, },
"license": "AGPL-3.0", "license": "AGPL-3.0",
"scripts": { "scripts": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment