mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02: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