Claire 34c9f77b3e Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/mailer.html.haml`: Conflict caused by glitch-soc's theming system. Used glitch-soc's path for the mailer pack.		2024-01-15 21:30:00 +01:00
..
icons
mailer
mailer-new	Update new email templates (#28416)	2024-01-15 18:18:59 +00:00
alert_badge.png
app-icon.svg
clippy_frame.png
clippy_wave.gif
elephant_ui_conversation.svg	Add new onboarding flow to web UI (#24619)	2023-04-23 22:24:53 +02:00
elephant_ui_disappointed.svg
elephant_ui_greeting.svg
elephant_ui_plane.svg
elephant_ui_working.svg
friends-cropped.png	Add onboarding prompt when home feed too slow in web UI (#25267)	2023-06-22 23:48:40 +02:00
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_full.svg
logo_transparent.svg
logo-symbol-icon.svg
logo-symbol-wordmark.svg
logo.svg
preview.png
reticle.png
screenshot.jpg
start.png
void.png