Claire ae2ff31f32 Merge commit '0caf334891e0a5f4e995f1d667eb83d3aad7e41e' into glitch-soc/merge-upstream ...

Conflicts:
- `lib/mastodon/version.rb`:
  Upstream updated the API version, while we also have a custom glitch API version.
  Updated as upstream did.

2026-05-30 12:13:35 +02:00

..

__mocks__

…

config

…

entrypoints

Add batch remove for collections in reports (#39020)

2026-05-18 14:53:40 +00:00

flavours

[Glitch] Enable vertical text editing on Alt text editor

2026-05-27 20:14:47 +02:00

fonts

…

icons

…

images

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

2026-04-30 19:00:48 +02:00

inline

…

mastodon

Merge commit '0caf334891e0a5f4e995f1d667eb83d3aad7e41e' into glitch-soc/merge-upstream

2026-05-30 12:13:35 +02:00

material-icons

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

2026-03-12 18:48:32 +01:00

skins

…

styles

Merge commit '9215e1ec53dcf3714080c84af7af070bcb8d9978' into glitch-soc/merge-upstream

2026-05-27 20:04:47 +02:00

svg-icons

…

testing

Profile redesign: Add alt to avatar and header (#38532)

2026-04-02 14:47:11 +00:00

types

Refactor emoji search (#39008)

2026-05-19 10:47:45 +00:00