mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
54148b9a4a
Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss |
||
---|---|---|
.. | ||
fonts | ||
mastodon | ||
application.scss | ||
win95.scss |