54148b9a4a
Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss |
||
---|---|---|
.. | ||
elephant-fren.png | ||
elephant-friend-1.png | ||
elephant-friend.png | ||
icon_about.png | ||
icon_blocks.png | ||
icon_home.png | ||
icon_likes.png | ||
icon_local.png | ||
icon_logout.png | ||
icon_mutes.png | ||
icon_pin.png | ||
icon_public.png | ||
icon_settings.png | ||
logo.svg | ||
logo_alt.svg | ||
logo_full.svg | ||
mastodon-not-found.png | ||
mastodon-ui.png | ||
preview.jpg | ||
screenshot.jpg | ||
start.png | ||
void.png | ||
wave-compose-standalone.png | ||
wave-drawer.png | ||
wave-modal.png |