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

..

__mocks__

…

entrypoints

Convert from Webpack to Vite (#34450)

2025-05-16 13:26:12 +00:00

flavours

[Glitch] fix: Avatars too large on notifications page

2025-06-12 17:54:52 +02:00

fonts

…

icons

…

images

Merge commit '7a70d9543525681b5c408cfd17782843da13177f' into glitch-soc/merge-upstream

2025-04-25 17:22:10 +02:00

mastodon

Merge commit '2254f47702368938bdfd0d997f2487fb2950d676' into glitch-soc/merge-upstream

2025-06-12 17:39:03 +02:00

material-icons

Merge commit '3aed93711c0118ab68fa09f4d3ac2635cb3344b8' into glitch-soc/merge-upstream

2025-06-11 22:52:21 +02:00

skins

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

2025-06-12 20:32:25 +02:00

styles

Merge commit '2254f47702368938bdfd0d997f2487fb2950d676' into glitch-soc/merge-upstream

2025-06-12 17:39:03 +02:00

svg-icons

…

types

Convert from Webpack to Vite (#34450)

2025-05-16 13:26:12 +00:00