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

..

index.html.haml

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

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

new.html.haml

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00