Files
mastodon/app/lib
Claire 80af1ea434 Merge commit '825312d4b0587c0da5575f8eaabe038438746cd3' into glitch-soc/merge-upstream
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.
2025-06-12 20:32:25 +02:00
..
2025-05-23 06:43:02 +00:00
2024-10-31 15:12:08 +00:00
2023-06-06 10:42:47 +02:00
2024-11-22 14:43:16 +00:00
2020-10-12 16:33:49 +02:00