tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '0af2c4829ff86cf84ed9e7804d023f31e805542b' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `vite.config.mts`:
  Conflict because of differently-named theme plugins.
  Updated to go with upstream's changes.
This commit is contained in:
Claire committed 2025-07-23 12:08:59 +02:00
2 parents b3809ffa31 0af2c4829f
commit 45d79427c4
26 files changed
+873 -265
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/renovate.json5
-1
View File
@@ -23,7 +23,6 @@
matchManagers: ['npm'],
matchPackageNames: [
'tesseract.js', // Requires code changes
'react-hotkeys', // Requires code changes
// react-router: Requires manual upgrade
'history',