ed572490c1
Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss |
||
---|---|---|
.. | ||
fonts | ||
mastodon | ||
application.scss | ||
win95.scss |
ed572490c1
Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss |
||
---|---|---|
.. | ||
fonts | ||
mastodon | ||
application.scss | ||
win95.scss |