Claire ba45eb8764 Merge commit 'bc2f8a358f96a9540e6f39bb1c58273deb4545de' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream changed how theming works, and in particular changed the set of HTML attributes.
  Adapted upstream's change.

2026-01-15 18:02:35 +01:00

..

admin_mailer.text.erb

…

admin.html.haml

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

2025-05-25 14:36:51 +02:00

application.html.haml

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

2026-01-15 18:02:35 +01:00

auth.html.haml

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

2025-09-16 18:30:30 +02:00

embedded.html.haml

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

2025-05-25 15:11:58 +02:00

error.html.haml

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

2025-05-25 15:11:58 +02:00

helper_frame.html.haml

Convert from Webpack to Vite (#34450)

2025-05-16 13:26:12 +00:00

mailer.html.haml

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

2025-05-25 14:36:51 +02:00

mailer.text.erb

…

modal.html.haml

Merge commit '284b46fee7ad682b52c99d0455a1134e1d4e3fc3' into glitch-soc/merge-upstream

2025-11-19 21:34:53 +01:00