Claire 6e9f89e5b6 Merge commit 'c85e0a6b047f1a72ad970bc04c4e1be3f028b3d1' into glitch-soc/merge-upstream ...

Conflicts:
- `app/javascript/packs/admin.jsx`:
  Upstream fixed `@rails/ujs` imports.
  Already taken care of in 8a131fb7bc32ef338e86cc74719815b12b67128f
- `app/javascript/packs/public.jsx`:
  Upstream fixed `@rails/ujs` imports.
  Already taken care of in 8a131fb7bc32ef338e86cc74719815b12b67128f

2023-10-25 12:18:45 +02:00

..

_error_messages.html.haml

Remove unused #error_explanation id from error partials (#27536)

2023-10-25 07:12:32 +00:00

_og.html.haml

Simplify instance presenter view access (#26046)

2023-09-28 16:52:37 +02:00

_web_app.html.haml

Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream

2023-07-30 13:42:06 +02:00