diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-05-23 19:01:30 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-05-23 19:01:30 +0200 |
| commit | c0dc247bcee9080989d5e5354e54f9d320be1f13 (patch) | |
| tree | 708074cbed581c48d619008f8ed58d962e0f15b7 /package.json | |
| parent | 0744d6e57186292e751026fbb749728d56a8ed2d (diff) | |
| parent | 89d600bedb023a9656b98d22deab10f8c051a664 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/account.rb - app/views/settings/profiles/show.html.haml - spec/controllers/api/v1/accounts/credentials_controller_spec.rb Conflicts were due to an increase in account bio length upstream, which is already covered in glitch-soc through `MAX_BIO_CHARS`.
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json index 8262c73aa..826a1935b 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "mastodon", "license": "AGPL-3.0-or-later", "engines": { - "node": ">=8 <11" + "node": ">=8.12 <12" }, "scripts": { "postversion": "git push --tags", @@ -70,6 +70,7 @@ "@babel/preset-env": "^7.3.4", "@babel/preset-react": "^7.0.0", "@babel/runtime": "^7.3.4", + "@clusterws/cws": "^0.14.0", "array-includes": "^3.0.3", "atrament": "^0.2.3", "autoprefixer": "^9.4.10", @@ -160,7 +161,6 @@ "tiny-queue": "^0.2.1", "uglifyjs-webpack-plugin": "^2.1.2", "uuid": "^3.1.0", - "uws": "10.148.0", "webpack": "^4.29.6", "webpack-assets-manifest": "^3.1.1", "webpack-bundle-analyzer": "^3.1.0", |