Claire 26193a119b Merge commit 'd9b70bbde13b78709b48be6c979bc7520e81520a' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper close to a glitch-soc one.
  Added upstream's helper.

2025-09-16 18:30:30 +02: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 '06803422da3794538cd9cd5c7ccd61a0694ef921' into glitch-soc/merge-upstream

2025-09-13 11:12:22 +02: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 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream

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