mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-12 02:32:55 -05:00
a6fb1c58ee
Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb