Conflicts: - `app/helpers/formatting_helper.rb`: Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span. Wrapped the modified code.  | 
			||
|---|---|---|
| .. | ||
| admin | ||
| filters | ||
| notifications | ||
| filters_spec.rb | ||
| instance_spec.rb | ||
| media_spec.rb | ||
| notifications_spec.rb | ||
| search_spec.rb | ||
| suggestions_spec.rb | ||