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 83774367d2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js` conflict because of the poll option limit being different than upstream's		5 years ago
..
activitypub	…
account_relationships_presenter.rb	Fix relationship caches being broken as result of a follow request (#12299)	5 years ago
initial_state_presenter.rb	…
instance_presenter.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
status_relationships_presenter.rb	…