mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-07 07:22:49 -05:00
Conflicts: - `app/views/layouts/mailer.html.haml`: Conflict caused by glitch-soc's theming system. Used glitch-soc's path for the mailer pack.