Conflicts: - `app/helpers/formatting_helper.rb`: Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span. Wrapped the modified code.  | 
			||
|---|---|---|
| .. | ||
| custom_emoji_parser.rb | ||
| media_attachment_parser.rb | ||
| poll_parser.rb | ||
| status_parser.rb | ||
				
					
						
							Conflicts: - `app/helpers/formatting_helper.rb`: Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span. Wrapped the modified code.  | 
			||
|---|---|---|
| .. | ||
| custom_emoji_parser.rb | ||
| media_attachment_parser.rb | ||
| poll_parser.rb | ||
| status_parser.rb | ||