Claire 15929a3d59 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. - `app/javascript/packs/mailer.js`: We had removed the file. Move the changes to `app/javascript/core/mailer.js`.		2022-06-11 00:08:41 +02:00
..
icons	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02:00
mailer	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02: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
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	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02:00
logo-symbol-wordmark.svg	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02:00
logo.svg	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02:00
preview.png	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02:00
reticle.png
screenshot.jpg
start.png
void.png