Merge branch 'main' into glitch-soc/merge-upstream

Conflicts: - `Gemfile.lock`: Upstream-updated lib textually too close to glitch-soc-only dep. Updated like upstream.
2022-01-28 08:58:32 +01:00
parent ad6ddb9bdd e38fc319dc
commit b2915613fb
116 changed files with 241 additions and 221 deletions
--- a/package.json
+++ b/package.json
@ -75,7 +75,7 @@
    "atrament": "0.2.4",
    "arrow-key-navigation": "^1.2.0",
    "autoprefixer": "^9.8.8",
-    "axios": "^0.24.0",
+    "axios": "^0.25.0",
    "babel-loader": "^8.2.3",
    "babel-plugin-lodash": "^3.3.4",
    "babel-plugin-preval": "^5.0.0",