Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'bc2f8a358f96a9540e6f39bb1c58273deb4545de' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream changed how theming works, and in particular changed the set of HTML attributes.
  Adapted upstream's change.
This commit is contained in:
Claire
2026-01-15 18:02:35 +01:00
parent fd510421c4 bc2f8a358f
commit ba45eb8764
33 changed files with 1981 additions and 1549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -87,7 +87,7 @@
"lodash": "^4.17.21",
"marky": "^1.2.5",
"path-complete-extname": "^1.0.0",
"postcss-preset-env": "^10.1.5",
"postcss-preset-env": "^11.0.0",
"prop-types": "^15.8.1",
"punycode": "^2.3.0",
"react": "^18.2.0",