Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.		2022-11-12 13:28:03 +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	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00
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	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_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_follow_requests.png	…
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_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_pin.png	…
icon_profile_directory.png	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00
icon_public.png	…
icon_settings.png	…
icon_tos.png	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00
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
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	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