mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-03-17 08:50:54 -04:00
Conflicts: - `app/helpers/formatting_helper.rb`: Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span. Wrapped the modified code.