mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-20 14:42:58 -05:00
34c9f77b3e
Conflicts: - `app/views/layouts/mailer.html.haml`: Conflict caused by glitch-soc's theming system. Used glitch-soc's path for the mailer pack.