Conflicts:
app/javascript/styles/mastodon/components.scss
|
||
|---|---|---|
| .. | ||
| blacklisted_email_validator.rb | ||
| status_length_validator.rb | ||
| status_pin_validator.rb | ||
| unreserved_username_validator.rb | ||
| url_validator.rb | ||
Conflicts:
app/javascript/styles/mastodon/components.scss
|
||
|---|---|---|
| .. | ||
| blacklisted_email_validator.rb | ||
| status_length_validator.rb | ||
| status_pin_validator.rb | ||
| unreserved_username_validator.rb | ||
| url_validator.rb | ||