Conflicts: - `app/helpers/formatting_helper.rb`: Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span. Wrapped the modified code. |
||
---|---|---|
.. | ||
safe_reblog_insert.rb | ||
search_concern.rb | ||
snapshot_concern.rb | ||
threading_concern.rb |