Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Minor upstream change, our README is completely different. Kept ours. - `lib/tasks/assets.rake`: glitch-soc has extra code to deal with its theming system, upstream changed a line that exists in glitch-soc. Applied upstream changes.
This commit is contained in:
@@ -39,7 +39,7 @@
|
||||
"atrament": "0.2.4",
|
||||
"arrow-key-navigation": "^1.2.0",
|
||||
"autoprefixer": "^9.8.8",
|
||||
"axios": "^1.2.6",
|
||||
"axios": "^1.3.2",
|
||||
"babel-loader": "^8.3.0",
|
||||
"babel-plugin-lodash": "^3.3.4",
|
||||
"babel-plugin-preval": "^5.1.0",
|
||||
@@ -67,7 +67,7 @@
|
||||
"glob": "^8.1.0",
|
||||
"history": "^4.10.1",
|
||||
"http-link-header": "^1.1.0",
|
||||
"immutable": "^4.2.2",
|
||||
"immutable": "^4.2.4",
|
||||
"imports-loader": "^1.2.0",
|
||||
"intl": "^1.2.5",
|
||||
"intl-messageformat": "^2.2.0",
|
||||
@@ -117,7 +117,7 @@
|
||||
"requestidlecallback": "^0.3.0",
|
||||
"reselect": "^4.1.7",
|
||||
"rimraf": "^4.1.2",
|
||||
"sass": "^1.57.1",
|
||||
"sass": "^1.58.0",
|
||||
"sass-loader": "^10.2.0",
|
||||
"stacktrace-js": "^2.0.2",
|
||||
"stringz": "^2.1.0",
|
||||
|
||||
Reference in New Issue
Block a user