Claire 06b1f8bd85 Merge commit '8224178e8ca9746f97ce341179d2c636fa22a082' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream added a condition where glitch-soc had changes on the same line.
  Adapted upstream's changes.

2025-06-02 20:05:43 +02:00

..

__mocks__

…

entrypoints

Convert from Webpack to Vite (#34450)

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

flavours

[Glitch] Fix not being able to scroll dropdown on touch devices in web UI

2025-06-02 12:17:04 +02:00

fonts

…

icons

…

images

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

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

mastodon

Merge commit '8224178e8ca9746f97ce341179d2c636fa22a082' into glitch-soc/merge-upstream

2025-06-02 20:05:43 +02:00

material-icons

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

2025-05-25 15:11:58 +02:00

skins

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

2025-05-25 14:36:51 +02:00

styles

Merge commit '9c80b16401e7606cbd7eb2bf3af32c18953d1d3f' into glitch-soc/merge-upstream

2025-06-02 12:16:06 +02:00

svg-icons

Change design of lists in web UI (#32881)

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

types

Convert from Webpack to Vite (#34450)

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