mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-13 06:03:49 -05:00
Conflicts: - `app/views/layouts/mailer.html.haml`: Upstream removed a line close to one modified by glitch-soc. Removed the line as upstream did.