diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-09-08 16:01:55 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-09-08 16:26:47 +0200 |
| commit | 9748f074a385fce5ad6913b1a22fb7ea9e7566db (patch) | |
| tree | ccd775be4b73170fcbf45407b84ad35fc37fb853 /package.json | |
| parent | 437d71bddf967573df3912ee5976f7c5a5a7b4c7 (diff) | |
| parent | 65760f59df46e388919a9f7ccba1958d967b2695 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/api/v1/timelines/public_controller.rb - app/lib/feed_manager.rb - app/models/status.rb - app/services/precompute_feed_service.rb - app/workers/feed_insert_worker.rb - spec/models/status_spec.rb All conflicts are due to upstream refactoring feed management and us having local-only toots on top of that. Rewrote local-only toots management for upstream's changes.
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package.json b/package.json index 3982f7cde..11e2b5c84 100644 --- a/package.json +++ b/package.json @@ -60,11 +60,11 @@ }, "private": true, "dependencies": { - "@babel/core": "^7.11.1", + "@babel/core": "^7.11.6", "@babel/plugin-proposal-class-properties": "^7.8.3", "@babel/plugin-proposal-decorators": "^7.10.5", "@babel/plugin-transform-react-inline-elements": "^7.10.4", - "@babel/plugin-transform-runtime": "^7.11.0", + "@babel/plugin-transform-runtime": "^7.11.5", "@babel/preset-env": "^7.11.0", "@babel/preset-react": "^7.10.4", "@babel/runtime": "^7.11.2", @@ -156,7 +156,7 @@ "reselect": "^4.0.0", "rimraf": "^3.0.2", "sass": "^1.26.10", - "sass-loader": "^9.0.3", + "sass-loader": "^10.0.2", "stacktrace-js": "^2.0.2", "stringz": "^2.1.0", "substring-trie": "^1.0.2", |