mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-26 11:21:36 +01: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. |
||
---|---|---|
.. | ||
custom_emoji_parser.rb | ||
media_attachment_parser.rb | ||
poll_parser.rb | ||
status_parser.rb |