mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-24 00:54:02 -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. |
||
---|---|---|
.. | ||
inter.scss | ||
roboto-mono.scss | ||
roboto.scss |