mirror of
https://github.com/mastodon/mastodon.git
synced 2025-02-07 17:58:23 +01:00
Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb
Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb