diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-08-29 12:07:50 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-29 12:07:50 +0200 |
| commit | 48b8a1f414e3d8430bd797e3db298fc5355ace2d (patch) | |
| tree | c7b84ed81fb99b51eb2596df8ac1663d1998fa89 /package.json | |
| parent | 79725f659d5e9c449df0ff73f9363407a0a064bd (diff) | |
| parent | 4500dc2385d8571c494ea0277fe4ca415a264404 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/status.rb - app/services/remove_status_service.rb - db/schema.rb All conflicts were due to the addition of a `deleted_at` attribute to Statuses and reworked database indexes.
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/package.json b/package.json index 6f6730b9a..cba13911f 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "private": true, "dependencies": { "@babel/core": "^7.4.5", - "@babel/plugin-proposal-class-properties": "^7.5.0", + "@babel/plugin-proposal-class-properties": "^7.5.5", "@babel/plugin-proposal-decorators": "^7.4.4", "@babel/plugin-proposal-object-rest-spread": "^7.4.4", "@babel/plugin-syntax-dynamic-import": "^7.2.0", @@ -137,7 +137,7 @@ "react-motion": "^0.5.2", "react-notification": "^6.8.4", "react-overlays": "^0.8.3", - "react-redux": "^7.1.0", + "react-redux": "^7.1.1", "react-redux-loading-bar": "^4.0.8", "react-router-dom": "^4.1.1", "react-router-scroll-4": "^1.0.0-beta.1", @@ -163,10 +163,11 @@ "throng": "^4.0.0", "tiny-queue": "^0.2.1", "uuid": "^3.1.0", + "wavesurfer.js": "^3.0.0", "webpack": "^4.35.3", "webpack-assets-manifest": "^3.1.1", "webpack-bundle-analyzer": "^3.3.2", - "webpack-cli": "^3.3.6", + "webpack-cli": "^3.3.7", "webpack-merge": "^4.2.1", "websocket.js": "^0.1.12" }, |