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 | ||
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 | ||