diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-07-23 10:17:06 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-07-23 10:51:07 +0200 |
commit | 444796b69b0cd2c7b4b95d3b3119e0b7a503f682 (patch) | |
tree | 6607b9d27817f66a1395bcfaea609198015f8973 /package.json | |
parent | 6db5669818cce459b9bb916665541b7b8f5d5155 (diff) | |
parent | ab3126e7a23125b033ec198cfd83c2178338442c (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package.json b/package.json index a56cc75ea..aa9d809f1 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "@babel/preset-env": "^7.4.5", "@babel/preset-react": "^7.0.0", "@babel/runtime": "^7.5.4", - "@clusterws/cws": "^0.14.0", + "@clusterws/cws": "^0.15.0", "array-includes": "^3.0.3", "atrament": "^0.2.3", "autoprefixer": "^9.6.0", @@ -106,7 +106,7 @@ "intersection-observer": "^0.7.0", "intl": "^1.2.5", "intl-messageformat": "^2.2.0", - "intl-relativeformat": "^6.4.2", + "intl-relativeformat": "^6.4.3", "is-nan": "^1.2.1", "js-yaml": "^3.13.1", "lodash": "^4.17.14", @@ -169,11 +169,11 @@ "websocket.js": "^0.1.12" }, "devDependencies": { - "babel-eslint": "^10.0.1", + "babel-eslint": "^10.0.2", "babel-jest": "^24.8.0", "enzyme": "^3.10.0", "enzyme-adapter-react-16": "^1.14.0", - "eslint": "^5.16.0", + "eslint": "^6.1.0", "eslint-plugin-import": "~2.18.0", "eslint-plugin-jsx-a11y": "~6.2.3", "eslint-plugin-promise": "~4.2.1", |