mirror of
https://github.com/Siphonay/mastodon
synced 2025-02-12 12:24:46 +00:00
Conflicts: - `config/environments/production.rb`: Upstream enforced a code style change and glitch-soc had a few different lines. Applied upstream's code style to glitch-soc's changes.