Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring		2022-12-15 20:25:25 +01:00
..
icons
mailer
alert_badge.png
app-icon.svg
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	Remove inline-css in logo (#20814)	2022-12-15 17:10:34 +01:00
logo-symbol-wordmark.svg	Remove inline-css in logo (#20814)	2022-12-15 17:10:34 +01:00
logo.svg
logo_full.svg	Add old logo files back (#20332)	2022-11-10 20:25:12 +01:00
logo_transparent.svg	Add old logo files back (#20332)	2022-11-10 20:25:12 +01:00
preview.png
reticle.png
screenshot.jpg
start.png
void.png