You can not 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 f3eff922a3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `app/validators/poll_validator.rb`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `config/initializers/content_security_policy.rb`: Upstream added a rule, the way we compute ours is different, but that added rule has been ported. - `package.json`: No real conflict, dependency update. Performed the same update. - `yarn.lock`: No real conflict, dependency update. Performed the same update.		5 years ago
..
about	…
accounts	…
admin	…
admin_mailer	…
application	…
auth	…
authorize_interactions	…
directories	…
errors	…
filters	…
follower_accounts	…
following_accounts	…
home	…
invites	…
kaminari	…
layouts	…
media	…
notification_mailer	Fix NotificationMailer failing when receiving mention with media from remote instance (#11765)	5 years ago
oauth	…
public_timelines	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
relationships	…
remote_follow	Admission-based registrations mode (#10250)	6 years ago
remote_interaction	…
settings	…
shared	…
shares	…
statuses	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
tags	…
user_mailer	…
well_known/host_meta	…