mastodon/app/views/application/mailer
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
_button.html.haml
_checklist.html.haml
_feature.html.haml
_follow.html.haml
_frame.html.haml
_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