Claire 05e5db91c7 Merge commit '3dcf5e12b1ffb8e57a7c1e1f3f1145c9bae477e8' into glitch-soc/merge-upstream ...

Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict because one of the removed lines was modified to accomodate for
  glitch-soc's slightly different build system.
  Removed the lines as upstream did.

2025-01-21 19:23:25 +01:00

..

__mocks__

…

entrypoints

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

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

flavours

[Glitch] Fix opening modals losing some location parameters

2025-01-21 12:07:40 +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 '3dcf5e12b1ffb8e57a7c1e1f3f1145c9bae477e8' into glitch-soc/merge-upstream

2025-01-21 19:23:25 +01:00

mastodon

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

2025-01-21 19:23:25 +01:00

material-icons

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

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

skins

…

styles

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

2025-01-21 19:23: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