mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-15 22:56:42 +00:00
a6fb1c58ee
Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb |
||
---|---|---|
.. | ||
confirmations_controller.rb | ||
omniauth_callbacks_controller.rb | ||
passwords_controller.rb | ||
registrations_controller.rb | ||
sessions_controller.rb |