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.
nyastodon/app/controllers/api
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
..
v1 Merge remote-tracking branch 'upstream/main' into develop 2 years ago
v2 Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
web Refactor formatter (#17828) 2 years ago
base_controller.rb Change AUTHORIZED_FETCH to not block unauthenticated REST API access 2 years ago
oembed_controller.rb