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.

David Yip a6fb1c58ee Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb		7 years ago
..
confirmations_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
omniauth_callbacks_controller.rb	CAS + SAML authentication feature (#6425)	7 years ago
passwords_controller.rb	Finalized theme loading and stuff	7 years ago
registrations_controller.rb	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	7 years ago
sessions_controller.rb	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	7 years ago