catstodon/app/views/application
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
..
mailer Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream 2024-11-03 20:51:58 +01:00
_card.html.haml Migrate fontawesome->material in more views (#31360) 2024-08-20 11:52:45 +00:00
_flashes.html.haml Added haml-lint and fix warnings (#2773) 2017-05-08 03:35:25 +02:00