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/auth
Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/application_controller.rb

Changed instance theme selection by instance flavour selection.
8 years ago
..
confirmations_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
omniauth_callbacks_controller.rb CAS + SAML authentication feature (#6425) 8 years ago
passwords_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
registrations_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
sessions_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago