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

Merge commit '825312d4b0587c0da5575f8eaabe038438746cd3' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict because of different theming system.
  Adapted upstream's changes.
- `vite.config.mts`:
  Conflict because of different theming system.
  Adapted upstream's changes.
This commit is contained in:
Claire committed 2025-06-12 20:32:25 +02:00
2 parents 7e85247645 825312d4b0
commit 80af1ea434
16 files changed
+109 -16
Download Patch File Download Diff File Expand all files Collapse all files