You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.		7 years ago
..
mailer	Crush PNGs to reduce overall size (#7954)	8 years ago
clippy_frame.png	Z indexes and colors	8 years ago
clippy_wave.gif	To 2.1.2	8 years ago
elephant-fren.png	Crush PNGs to reduce overall size (#7954)	8 years ago
elephant_ui_disappointed.svg	Fix home regeneration (#6251)	8 years ago
elephant_ui_greeting.svg	Restore onboarding modal (#6303)	8 years ago
elephant_ui_plane.svg	Replace drawer elephant graphic with a vector image (#6286)	8 years ago
elephant_ui_working.svg	Fix home regeneration (#6251)	8 years ago
icon_about.png	Theme: Windows 95	8 years ago
icon_blocks.png	Theme: Windows 95	8 years ago
icon_cached.svg	Use better reblog icon and improve contrast in HTML e-mails (#6272)	8 years ago
icon_done.svg	Replace tutorial modal with welcome e-mail (#6273)	8 years ago
icon_email.svg	HTML e-mails for UserMailer (#6256)	8 years ago
icon_file_download.svg	Account archive download (#6460)	8 years ago
icon_follow_requests.png	Win95 to 2.1	8 years ago
icon_grade.svg	HTML e-mails for NotificationMailer (#6263)	8 years ago
icon_home.png	Theme: Windows 95	8 years ago
icon_keyboard_shortcuts.png	Win95 to 2.1	8 years ago
icon_likes.png	Theme: Windows 95	8 years ago
icon_lists.png	Win95 to 2.1	8 years ago
icon_local.png	Theme: Windows 95	8 years ago
icon_lock_open.svg	HTML e-mails for UserMailer (#6256)	8 years ago
icon_logout.png	Theme: Windows 95	8 years ago
icon_mutes.png	Theme: Windows 95	8 years ago
icon_person_add.svg	HTML e-mails for NotificationMailer (#6263)	8 years ago
icon_pin.png	Theme: Windows 95	8 years ago
icon_public.png	Theme: Windows 95	8 years ago
icon_reply.svg	HTML e-mails for NotificationMailer (#6263)	8 years ago
icon_settings.png	Theme: Windows 95	8 years ago
logo.svg	Remove redundant width/height values from SVGs to fix Safari bug (#4956)	9 years ago
logo_alt.svg	Remove redundant width/height values from SVGs to fix Safari bug (#4956)	9 years ago
logo_full.svg	Remove redundant width/height values from SVGs to fix Safari bug (#4956)	9 years ago
logo_transparent.svg	HTML e-mails for UserMailer (#6256)	8 years ago
preview.jpg	Uploads for admin site settings (#4913)	9 years ago
reticle.png	Crush PNGs to reduce overall size (#7954)	8 years ago
screen_federation.svg	Add new first-time tutorial (#9531)	7 years ago
screen_hello.svg	Add new first-time tutorial (#9531)	7 years ago
screen_interactions.svg	Add new first-time tutorial (#9531)	7 years ago
screenshot.jpg	Screenshot support for themes	8 years ago
start.png	Theme: Windows 95	8 years ago
void.png	Crush PNGs to reduce overall size (#7954)	8 years ago