mastodon/app/javascript/images
Claire 0e74d4da59 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Changed upstream, while we modified it in glitch-soc to not get spammed
  by dependabot.
  Kept it removed.
- `README.md`:
  Changed upstream, which has a very different version.
  Discarded upstream changes.
2022-06-21 08:28:59 +02:00
..
icons Change brand color and logotypes (#18592) 2022-06-09 22:25:23 +02:00
mailer Fix wrong aspect ratio of logo in icons (#18639) 2022-06-11 20:32:02 +02:00
alert_badge.png
app-icon.svg Change brand color and logotypes (#18592) 2022-06-09 22:25:23 +02:00
clippy_frame.png
clippy_wave.gif
elephant_ui_disappointed.svg
elephant_ui_greeting.svg
elephant_ui_plane.svg
elephant_ui_working.svg
icon_about.png
icon_blocks.png
icon_bookmarks.png
icon_developers.png
icon_direct.png
icon_docs.png
icon_domain_blocks.png
icon_follow_requests.png
icon_home.png
icon_invite.png
icon_keyboard_shortcuts.png
icon_likes.png
icon_lists.png
icon_local.png
icon_logout.png
icon_mobile_apps.png
icon_mutes.png
icon_notifications.png
icon_pin.png
icon_profile_directory.png
icon_public.png
icon_settings.png
icon_tos.png
logo-symbol-icon.svg Fix wrong aspect ratio of logo in icons (#18639) 2022-06-11 20:32:02 +02:00
logo-symbol-wordmark.svg Change brand color and logotypes (#18592) 2022-06-09 22:25:23 +02:00
logo.svg Fix wrong aspect ratio of logo in icons (#18639) 2022-06-11 20:32:02 +02:00
preview.png Change brand color and logotypes (#18592) 2022-06-09 22:25:23 +02:00
reticle.png
screenshot.jpg
start.png
void.png