mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-18 00:23:51 -05: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