mirror of
https://github.com/funamitech/mastodon
synced 2024-12-15 15:18:30 +09: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 |