Claire 25a46d9e59 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/fonts/montserrat.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/javascript/styles/fonts/roboto-mono.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/javascript/styles/fonts/roboto.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/models/account.rb`: Textual conflict only caused by glitch-soc using a different value for character limits in a nearby line. Applied upstream's changes. - `app/views/statuses/_simple_status.html.haml`: Attribute added to a tag modified by glitch-soc. Added upstream's attributes. - `yarn.lock`: Upstream added/updated dependencies close to glitch-soc-only ones. Updated/added upstream dependencies.		2022-06-02 09:49:38 +02:00
..
mailer	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
alert_badge.png	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00
clippy_frame.png
clippy_wave.gif
elephant_ui_disappointed.svg
elephant_ui_greeting.svg
elephant_ui_plane.svg	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
elephant_ui_working.svg
icon_about.png
icon_blocks.png
icon_bookmarks.png	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00
icon_cached.svg
icon_developers.png	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00
icon_direct.png	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00
icon_docs.png	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00
icon_domain_blocks.png	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00
icon_done.svg
icon_email.svg
icon_file_download.svg
icon_flag.svg	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
icon_follow_requests.png
icon_grade.svg
icon_home.png
icon_invite.png	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00
icon_keyboard_shortcuts.png
icon_likes.png
icon_lists.png
icon_local.png
icon_lock_open.svg
icon_logout.png
icon_mobile_apps.png	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00
icon_mutes.png
icon_notifications.png	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00
icon_person_add.svg
icon_pin.png
icon_profile_directory.png	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00
icon_public.png
icon_reply.svg
icon_settings.png
icon_tos.png	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00
logo.svg
logo_full.svg	Change full logo to use primary text color of the given theme (#10994)	2019-06-08 15:30:06 +02:00
logo_transparent.svg	Use <use /> to render transparent SVG logo instead of inserting it (#10845)	2019-05-27 03:33:39 +02:00
logo_transparent_white.svg	Fix keybase config serializer (#13742)	2020-05-12 15:28:29 +02:00
preview.jpg
reticle.png
screenshot.jpg
start.png
void.png