mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-21 18:13:47 -05:00
Conflicts: - `.env.production.sample`: Upstream and glitch-soc had different comments, some comments got updated upstream. Updated them in glitch-soc accordingly.