mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-12 06:06:22 +01:00
33c80e0783
Conflicts: - app/models/media_attachment.rb |
||
---|---|---|
.. | ||
blacklisted_email_validator_spec.rb | ||
disallowed_hashtags_validator_spec.rb | ||
email_mx_validator_spec.rb | ||
follow_limit_validator_spec.rb | ||
poll_validator_spec.rb | ||
status_length_validator_spec.rb | ||
status_pin_validator_spec.rb | ||
unique_username_validator_spec.rb | ||
unreserved_username_validator_spec.rb | ||
url_validator_spec.rb |