mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-06 02:06:33 +00:00
Conflicts: - `Gemfile.lock`: not a real conflict, upstream update too close to a glitch-soc-specific dependency |
||
---|---|---|
.. | ||
contrast | ||
fonts | ||
mastodon | ||
mastodon-light | ||
application.scss | ||
contrast.scss | ||
mailer.scss | ||
mastodon-light.scss | ||
win95.scss |