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.

Thibaut Girka db200226b8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…		6 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 branch 'master' into glitch-soc/merge-upstream	6 years ago
sessions_controller.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago