mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-03-28 14:20:46 -04:00
Conflicts: - `.env.production.sample`: Upstream added a block of three environment variables, while glitch-soc has a different version of the file overall. Added upstream's changes.