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 8a131fb7bc - `app/javascript/packs/public.jsx`: Upstream fixed `@rails/ujs` imports. Already taken care of in 8a131fb7bc		2023-10-25 12:18:45 +02:00
..
_error_messages.html.haml	…
_og.html.haml	…
_web_app.html.haml	…