Conflicts: - `app/helpers/formatting_helper.rb`: Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span. Wrapped the modified code. |
||
|---|---|---|
| .. | ||
| v1 | ||
| v2 | ||
| web | ||
| oembed_spec.rb | ||
Conflicts: - `app/helpers/formatting_helper.rb`: Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span. Wrapped the modified code. |
||
|---|---|---|
| .. | ||
| v1 | ||
| v2 | ||
| web | ||
| oembed_spec.rb | ||