mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-23 08:34:13 -05:00
f624ef2778
Conflicts: - `app/helpers/formatting_helper.rb`: Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span. Wrapped the modified code. |
||
---|---|---|
.. | ||
base_controller.rb | ||
collections_controller.rb | ||
followers_synchronizations_controller.rb | ||
inboxes_controller.rb | ||
likes_controller.rb | ||
outboxes_controller.rb | ||
replies_controller.rb | ||
shares_controller.rb |