mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-13 19:54:01 -05:00
3ab6a8b8be
Conflicts: spec/views/about/show.html.haml_spec.rb |
||
---|---|---|
.. | ||
fonts | ||
mastodon | ||
application.scss | ||
mailer.scss | ||
win95.scss |