mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-28 13:47:23 +00:00
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did.
This commit is contained in:
@@ -68,7 +68,7 @@
|
||||
"fuzzysort": "^2.0.4",
|
||||
"glob": "^10.0.0",
|
||||
"history": "^4.10.1",
|
||||
"http-link-header": "^1.1.0",
|
||||
"http-link-header": "^1.1.1",
|
||||
"immutable": "^4.3.0",
|
||||
"imports-loader": "^1.2.0",
|
||||
"intl": "^1.2.5",
|
||||
@@ -86,7 +86,7 @@
|
||||
"path-complete-extname": "^1.0.0",
|
||||
"pg": "^8.5.0",
|
||||
"pg-connection-string": "^2.5.0",
|
||||
"postcss": "^8.4.21",
|
||||
"postcss": "^8.4.22",
|
||||
"postcss-loader": "^4.3.0",
|
||||
"promise.prototype.finally": "^3.1.4",
|
||||
"prop-types": "^15.8.1",
|
||||
@@ -116,7 +116,7 @@
|
||||
"redux-thunk": "^2.4.2",
|
||||
"regenerator-runtime": "^0.13.11",
|
||||
"requestidlecallback": "^0.3.0",
|
||||
"reselect": "^4.1.7",
|
||||
"reselect": "^4.1.8",
|
||||
"rimraf": "^5.0.0",
|
||||
"sass": "^1.61.0",
|
||||
"sass-loader": "^10.2.0",
|
||||
|
||||
Reference in New Issue
Block a user