mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-16 03:43:08 +00:00
0ad919b192
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. |
||
|---|---|---|
| .. | ||
| 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 | ||
| logo-symbol-wordmark.svg | ||
| logo.svg | ||
| preview.png | ||
| reticle.png | ||
| screenshot.jpg | ||
| start.png | ||
| void.png | ||
