Claire 11902d958f Merge commit 'ce1680e6f979889ebd5c775353f3b82a8b2698bb' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Upstream added a new helper for a setting, where glitch-soc had extra ones.
  Not a real conflict, added upstream's new helper without removing glitch-soc's ones.

2025-08-09 23:02:43 +02:00

..

__mocks__

…

entrypoints

Convert from Webpack to Vite (#34450)

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

flavours

[Glitch] Bundle quotes and mentions in the same quickfilter bar since quotes don't have their own icon

2025-08-06 22:43:44 +02:00

fonts

…

icons

…

images

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

2025-08-06 22:02:55 +02:00

mastodon

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

2025-08-09 23:02:43 +02:00

material-icons

Merge commit '081d38679f965ac20ff1a6c72e2fc1108c34ac30' into glitch-soc/merge-upstream

2025-08-04 21:24:47 +02:00

skins

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

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

styles

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

2025-07-30 20:05:45 +02:00

svg-icons

…

testing

Emoji Rendering Efficiency (#35568)

2025-07-31 17:30:14 +00:00

types

Convert from Webpack to Vite (#34450)

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