Claire 323c6e51fe Merge commit '7530f06deea63a03e0ca05f777f0f1582372c305' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream reorganized the whole page, while glitch-soc had an extra setting.
  Adopted upstream's redesign and moved the extra setting where it made sense.

2025-10-16 19:23:29 +02:00

..

__mocks__

…

config

[Glitch] Adds new HTMLBlock component

2025-09-27 22:05:42 +02:00

entrypoints

Add support for displaying link previews for Admin UI (#35958)

2025-10-10 08:43:48 +00:00

flavours

[Glitch] Fix pinned hashtag columns fully refreshing unprompted

2025-10-16 18:38:10 +02:00

fonts

…

icons

…

images

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

2025-08-06 22:02:55 +02:00

mastodon

Merge commit '7530f06deea63a03e0ca05f777f0f1582372c305' into glitch-soc/merge-upstream

2025-10-16 19:23:29 +02:00

material-icons

Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream

2025-09-02 19:07:51 +02:00

skins

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

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

styles

Merge commit '7530f06deea63a03e0ca05f777f0f1582372c305' into glitch-soc/merge-upstream

2025-10-16 19:23:29 +02:00

svg-icons

…

testing

Emoji: Cleanup new code (#36402)

2025-10-14 09:36:25 +00:00

types

Emoji Component (#36293)

2025-09-30 13:06:02 +00:00