Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `package.json`: Upstream removed a dependency that was textually close to a glitch-soc-only dependency. Removed the dependency as upstream did, while keeping the glitch-soc-only dependency.
This commit is contained in:
@@ -38,7 +38,6 @@
|
||||
"@github/webauthn-json": "^2.1.1",
|
||||
"@rails/ujs": "^6.1.7",
|
||||
"abortcontroller-polyfill": "^1.7.5",
|
||||
"array-includes": "^3.1.6",
|
||||
"atrament": "0.2.4",
|
||||
"arrow-key-navigation": "^1.2.0",
|
||||
"autoprefixer": "^10.4.14",
|
||||
@@ -203,7 +202,7 @@
|
||||
"react-test-renderer": "^16.14.0",
|
||||
"stylelint": "^15.3.0",
|
||||
"stylelint-config-standard-scss": "^7.0.1",
|
||||
"typescript": "^4.9.5",
|
||||
"typescript": "^5.0.3",
|
||||
"webpack-dev-server": "^3.11.3",
|
||||
"yargs": "^17.7.1"
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user