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.

imncls bb6988a7ac Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.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 branch 'master' of https://github.com/tootsuite/mastodon	7 years ago