Claire f624ef2778 Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/formatting_helper.rb`: Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span. Wrapped the modified code.		2024-11-03 20:51:58 +01:00
..
_account.html.haml	Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream	2024-01-17 18:32:15 +01:00
_button.html.haml	New welcome email (#28883)	2024-03-01 12:16:53 +00:00
_checklist.html.haml	Simplify checklist step loop in welcome mailer (#29761)	2024-03-28 10:56:33 +00:00
_feature.html.haml	Use partial collection render for welcome mailer features (#29843)	2024-04-04 16:13:10 +00:00
_follow.html.haml	New welcome email (#28883)	2024-03-01 12:16:53 +00:00
_frame.html.haml	Update new email templates (#28416)	2024-01-15 18:18:59 +00:00
_hashtag.html.haml	Fix broken i18n in text welcome mailer tags area (#32571)	2024-10-18 07:19:37 +00:00
_heading.html.haml	Mailer header partial access cleanup (#32585)	2024-10-28 13:41:56 +00:00