Claire fcb7917344 Merge commit '208cb8276ae618aa36aec5fad0dc31341402c133' into glitch-soc/merge-4.4 ...

Conflicts:
- `app/models/trends/statuses.rb`:
  Conflict because of glitch-soc's setting to allow CWs in trends.
  Kept glitch-soc's setting but followed upstream's refactor.

2025-08-04 21:48:37 +02:00

..

__mocks__

Change icon SVG imports to use a default import (#28709)

2024-01-12 10:31:24 +00:00

entrypoints

Convert from Webpack to Vite (#34450)

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

flavours

[Glitch] Fix replying from media modal or pop-in-player tagging user @undefined

2025-07-25 23:43:01 +02:00

fonts

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

2024-01-15 21:30:00 +01:00

icons

…

images

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

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

mastodon

Merge commit '208cb8276ae618aa36aec5fad0dc31341402c133' into glitch-soc/merge-4.4

2025-08-04 21:48:37 +02:00

material-icons

Merge commit '69f298731e523f7f2e97ddd6a559dfb485d4495c' into glitch-soc/merge-upstream

2025-06-16 21:07:55 +02:00

skins

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

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

styles

Merge commit '77d2cdb30230ae6292bd247f6c6f97d00bd38084' into glitch-soc/backports-4.4

2025-07-23 18:10:05 +02:00

svg-icons

Change design of lists in web UI (#32881)

2024-11-21 16:10:04 +00:00

testing

Storybook Helpers (#35158)

2025-06-25 11:20:11 +00:00

types

Convert from Webpack to Vite (#34450)

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