This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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.		2018-12-18 16:55:15 +01:00
..
mailer	…
clippy_frame.png	…
clippy_wave.gif	…
elephant-fren.png	…
elephant_ui_disappointed.svg	…
elephant_ui_greeting.svg	…
elephant_ui_plane.svg	…
elephant_ui_working.svg	…
icon_about.png	…
icon_blocks.png	…
icon_cached.svg	…
icon_done.svg	…
icon_email.svg	…
icon_file_download.svg	…
icon_follow_requests.png	…
icon_grade.svg	…
icon_home.png	…
icon_keyboard_shortcuts.png	…
icon_likes.png	…
icon_lists.png	…
icon_local.png	…
icon_lock_open.svg	…
icon_logout.png	…
icon_mutes.png	…
icon_person_add.svg	…
icon_pin.png	…
icon_public.png	…
icon_reply.svg	…
icon_settings.png	…
logo.svg	…
logo_alt.svg	…
logo_full.svg	…
logo_transparent.svg	…
preview.jpg	…
reticle.png	…
screen_federation.svg	…
screen_hello.svg	…
screen_interactions.svg	…
screenshot.jpg	…
start.png	…
void.png	…