Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.		2022-11-06 09:50:41 +01:00
..
icons	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02:00
mailer	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01: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	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
reticle.png	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
screenshot.jpg
start.png
void.png	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00