Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.

2022-11-06 09:50:41 +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

Z indexes and colors

2018-01-06 18:38:19 -08:00

clippy_wave.gif

To 2.1.2

2018-01-06 18:25:19 -08:00

elephant_ui_disappointed.svg

Fix home regeneration (#6251)

2018-01-17 23:56:03 +01:00

elephant_ui_greeting.svg

Restore onboarding modal (#6303)

2018-01-20 01:32:37 +01:00

elephant_ui_plane.svg

Add announcements (#12662)

2020-01-23 22:00:13 +01:00

elephant_ui_working.svg

Fix home regeneration (#6251)

2018-01-17 23:56:03 +01:00

icon_about.png

Theme: Windows 95

2018-01-05 16:22:58 -08:00

icon_blocks.png

Theme: Windows 95

2018-01-05 16:22:58 -08:00

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

Win95 to 2.1

2018-01-05 16:22:58 -08:00

icon_home.png

Theme: Windows 95

2018-01-05 16:22:58 -08:00

icon_invite.png

Update win95 style from cybre.space

2022-04-27 23:05:24 +02:00

icon_keyboard_shortcuts.png

Win95 to 2.1

2018-01-05 16:22:58 -08:00

icon_likes.png

Theme: Windows 95

2018-01-05 16:22:58 -08:00

icon_lists.png

Win95 to 2.1

2018-01-05 16:22:58 -08:00

icon_local.png

Theme: Windows 95

2018-01-05 16:22:58 -08:00

icon_logout.png

Theme: Windows 95

2018-01-05 16:22:58 -08:00

icon_mobile_apps.png

Update win95 style from cybre.space

2022-04-27 23:05:24 +02:00

icon_mutes.png

Theme: Windows 95

2018-01-05 16:22:58 -08:00

icon_notifications.png

Update win95 style from cybre.space

2022-04-27 23:05:24 +02:00

icon_pin.png

Theme: Windows 95

2018-01-05 16:22:58 -08:00

icon_profile_directory.png

Update win95 style from cybre.space

2022-04-27 23:05:24 +02:00

icon_public.png

Theme: Windows 95

2018-01-05 16:22:58 -08:00

icon_settings.png

Theme: Windows 95

2018-01-05 16:22:58 -08:00

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

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

Screenshot support for themes

2017-12-10 20:32:28 -08:00

start.png

Theme: Windows 95

2018-01-05 16:22:58 -08:00

void.png

png optimization(loss less) (#19630)

2022-11-01 15:06:52 +01:00