mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-16 03:35:16 +00:00
1c9c0167b7
Conflicts: app/models/account.rb app/views/accounts/_header.html.haml |
||
---|---|---|
.. | ||
contrast | ||
fonts | ||
mastodon | ||
application.scss | ||
contrast.scss | ||
mailer.scss | ||
mastodon-light.scss | ||
win95.scss |