diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-03-22 19:50:11 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-03-22 19:50:11 +0100 |
| commit | 5ac380c1226a8225a84835f6c70b7bdf00f99fb2 (patch) | |
| tree | 432e2dce315060938ecc0ba05a9ae20fdb1da2d7 /package.json | |
| parent | 02ac94490a67659c7cc669ead5b107b724db6e68 (diff) | |
| parent | 2626097869c9520c21aaba73c9bcfe72c0f25f28 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/status.rb`: Upstream added lines close to a glitch-soc only line, not a real conflict. Applied upstream's changes (added hooks) while keeping glitch-soc's changes (`local_only` scope). - `config/environments/production.rb`: Upstream removed a header, while we have glitch-soc specific ones. Removed the header removed upstream.
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 016e615f9..b42b95257 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "react-redux-loading-bar": "^5.0.4", "react-router-dom": "^4.1.1", "react-router-scroll-4": "^1.0.0-beta.1", - "react-select": "^5.7.0", + "react-select": "^5.7.1", "react-sparklines": "^1.7.0", "react-swipeable-views": "^0.14.0", "react-textarea-autosize": "^8.4.0", @@ -156,11 +156,11 @@ "jest": "^29.5.0", "jest-environment-jsdom": "^29.5.0", "postcss-scss": "^4.0.6", - "prettier": "^2.8.4", + "prettier": "^2.8.5", "raf": "^3.4.1", "react-intl-translations-manager": "^5.0.3", "react-test-renderer": "^16.14.0", - "stylelint": "^15.2.0", + "stylelint": "^15.3.0", "stylelint-config-standard-scss": "^7.0.1", "webpack-dev-server": "^3.11.3", "yargs": "^17.7.1" |