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
David Yip 4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
Conflicts:
      app/javascript/styles/mastodon/components.scss
7 years ago
..
confirmations_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream 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