9adeaf2bfc
Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system |
||
---|---|---|
.. | ||
blacklisted_email_validator.rb | ||
disallowed_hashtags_validator.rb | ||
domain_validator.rb | ||
email_mx_validator.rb | ||
existing_username_validator.rb | ||
follow_limit_validator.rb | ||
html_validator.rb | ||
note_length_validator.rb | ||
poll_validator.rb | ||
reaction_validator.rb | ||
status_length_validator.rb | ||
status_pin_validator.rb | ||
unique_username_validator.rb | ||
unreserved_username_validator.rb | ||
url_validator.rb | ||
vote_validator.rb |