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.
mastodon/app/controllers/oauth
Thibaut Girka cd99255698 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/oauth/authorizations_controller.rb

Just two changes being too close to one another.
Took both.
8 years ago
..
authorizations_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
authorized_applications_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
tokens_controller.rb