mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-25 02:09:42 +00:00
dbe311f0e9
Conflicts: - config/locales/simple_form.pl.yml |
||
---|---|---|
.. | ||
contrast | ||
fonts | ||
mastodon | ||
mastodon-light | ||
application.scss | ||
contrast.scss | ||
mailer.scss | ||
mastodon-light.scss | ||
win95.scss |