Claire 395b9011ee Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, just upstream adding a method textually adjacent to glitch-soc only code. Ported upstream's change.		2024-06-17 18:30:28 +02:00
..
admin.html.haml	Replace use_pack, layouts/theme and @theme by new helpers	2024-04-28 15:45:42 +02:00
admin_mailer.text.erb	Use admin_mailer layout with initial salutation (#28085)	2023-11-28 07:41:26 +00:00
application.html.haml	Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream	2024-06-17 18:30:28 +02:00
auth.html.haml	Replace use_pack, layouts/theme and @theme by new helpers	2024-04-28 15:45:42 +02:00
embedded.html.haml	Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream	2024-06-06 12:27:26 +02:00
error.html.haml	Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream	2024-05-01 14:25:47 +02:00
helper_frame.html.haml	Change interaction modal in web UI (#26075)	2023-07-27 16:11:17 +02:00
mailer.html.haml	Drop hardcoded reliance on vanilla flavor	2024-04-28 22:38:11 +02:00
mailer.text.erb	Replace tutorial modal with welcome e-mail (#6273)	2018-01-18 19:17:25 +01:00
modal.html.haml	Replace use_pack, layouts/theme and @theme by new helpers	2024-04-28 15:45:42 +02:00