Claire e7498887a7 Merge commit '2e9b2df570af19b67a5ccc754c7b581034ca79c6' into glitch-soc/merge-upstream ...

Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Upstream removed some code that somehow had been modified in glitch-soc.
  Removed it as upstream did.

2025-03-24 20:06:25 +01:00

..

__mocks__

…

entrypoints

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

2025-03-07 17:37:36 +01:00

flavours

[Glitch] Fix display of failed-to-load image attachments in web UI

2025-03-22 15:51:00 +01:00

fonts

…

icons

…

images

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

2025-02-12 18:40:21 +01:00

mastodon

Merge commit '2e9b2df570af19b67a5ccc754c7b581034ca79c6' into glitch-soc/merge-upstream

2025-03-24 20:06:25 +01:00

material-icons

Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream

2025-01-27 18:19:09 +01:00

skins

…

styles

Merge commit '2e9b2df570af19b67a5ccc754c7b581034ca79c6' into glitch-soc/merge-upstream

2025-03-24 20:06:25 +01:00

svg-icons

Change design of lists in web UI (#32881)

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

types

Change design of edit media modal in web UI (#33516)

2025-01-21 11:34:22 +00:00