mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-14 11:43:05 -05:00
9765d2b3f8
Conflicts: - `config/environments/production.rb`: Upstream changed headers, and we have different ones. Ported upstream's change.