mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-13 15:58:50 +00:00
Conflicts: - `app/helpers/formatting_helper.rb`: Upstream removed OTel instrumentation around some code modified in glitch-soc because of the Markdown rendering feature. Removed the OTel instrumentation as upstream did.