Claire f7b4580b49 Merge commit '0d650780e26735621f08bbdd545b162871e4562c' into glitch-soc/merge-upstream ...

Conflicts:
- `.prettierignore`:
  Upstream added a file, glitch-soc had extra files.
  Took upstream's changes and moved glitch-soc's additions at the end.

2025-06-26 18:04:37 +02:00

..

__mocks__

…

entrypoints

Convert from Webpack to Vite (#34450)

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

flavours

[Glitch] fix: Fix search icon overlapping text on Trending page

2025-06-25 19:46:43 +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 '0d650780e26735621f08bbdd545b162871e4562c' into glitch-soc/merge-upstream

2025-06-26 18:04: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 '0d650780e26735621f08bbdd545b162871e4562c' into glitch-soc/merge-upstream

2025-06-26 18:04:37 +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