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.

Jeremy Kescher 03f50f2f00 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # app/javascript/flavours/glitch/features/ui/components/link_footer.js # lib/mastodon/version.rb # public/avatars/original/missing.png		2 years ago
..
accounts	…
admin	Fix admin APIs returning deleted object instead of empty object upon delete (#19479)	2 years ago
announcements	…
apps	…
crypto	…
emails	…
featured_tags	…
filters	…
instances	…
lists	…
polls	…
push	…
statuses	…
timelines	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
trends	Add missing require_auth? in StatusController	2 years ago
accounts_controller.rb	…
announcements_controller.rb	…
apps_controller.rb	…
blocks_controller.rb	…
bookmarks_controller.rb	…
conversations_controller.rb	…
custom_emojis_controller.rb	…
directories_controller.rb	…
domain_blocks_controller.rb	…
endorsements_controller.rb	…
favourites_controller.rb	…
featured_tags_controller.rb	Change featured tag updates to add/remove activity (#19409)	2 years ago
filters_controller.rb	…
follow_requests_controller.rb	…
followed_tags_controller.rb	…
instances_controller.rb	…
lists_controller.rb	…
markers_controller.rb	…
media_controller.rb	…
mutes_controller.rb	…
notifications_controller.rb	…
polls_controller.rb	…
preferences_controller.rb	…
reports_controller.rb	…
scheduled_statuses_controller.rb	…
statuses_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
streaming_controller.rb	…
suggestions_controller.rb	…
tags_controller.rb	…