Claire 799bd69189 Merge commit '2f657019201d73c9d86d1ece339e66e72954f0eb' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
  Upstream refactored a line adjacent to a glitch-soc modified line.
  Ported upstream changes.

2026-03-02 12:19:02 +01:00

..

__mocks__

…

config

…

entrypoints

Fix username availability check being wrongly applied on race conditions (#37975)

2026-02-25 14:30:01 +00:00

flavours

[Glitch] Fix avatar alt-text running into other elements on image load failure

2026-02-27 21:35:02 +01:00

fonts

…

icons

…

images

Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream

2026-02-18 18:40:03 +01:00

inline

…

mastodon

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

2026-03-02 12:19:02 +01:00

material-icons

Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream

2026-02-18 18:40:03 +01:00

skins

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

2026-02-11 13:32:18 +01:00

styles

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

2026-02-27 21:25:37 +01:00

svg-icons

…

testing

Only suggest discoverable accounts in collection account editor (#37920)

2026-02-19 16:43:31 +00:00

types

…