Claire 297eb7c956 Merge commit '4bd969e4bb54297981d385903bf8a4348b394f09' into glitch-soc/merge-upstream ...

Conflicts:
- `CONTRIBUTING.md`:
  Upstream modified it while we quote upstream's within an otherwise different file.
  Applied upstream's changes.

2025-01-18 12:42:17 +01:00

..

__mocks__

…

entrypoints

Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream

2025-01-10 20:41:36 +01:00

flavours

Fix attachment list in conversation component (#2941)

2025-01-15 08:18:39 +01:00

fonts

…

hooks

Change search to use query params in web UI (#32949)

2024-12-12 17:12:33 +00:00

icons

…

images

Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream

2024-11-10 13:18:43 +01:00

mastodon

Merge commit '4bd969e4bb54297981d385903bf8a4348b394f09' into glitch-soc/merge-upstream

2025-01-18 12:42:17 +01:00

material-icons

Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream

2024-11-10 13:18:43 +01:00

skins

…

styles

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

2025-01-14 20:38:32 +01:00

svg-icons

Change design of lists in web UI (#32881)

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

types

…