mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-20 08:59:23 +00:00
54148b9a4a
Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss |
||
---|---|---|
.. | ||
fonts | ||
mastodon | ||
application.scss | ||
win95.scss |