mirror of
https://github.com/glitch-soc/mastodon.git
synced 2026-03-29 19:21:36 +02:00
Conflicts: - `app/helpers/formatting_helper.rb`: Upstream added an optional keyword argument where glitch-soc already had one for content-type. Added upstream's new option while keeping glitch-soc's.