mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-21 14:23:04 +00:00
a6fb1c58ee
Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb |
||
---|---|---|
.. | ||
blacklisted_email_validator.rb | ||
status_length_validator.rb | ||
status_pin_validator.rb | ||
unreserved_username_validator.rb | ||
url_validator.rb |