Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system

2020-01-24 14:37:06 +01:00

..

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

Add announcements (#12662)

2020-01-23 22:00:13 +01:00

status_length_validator.rb

…

status_pin_validator.rb

…

unique_username_validator.rb

…

unreserved_username_validator.rb

…

url_validator.rb

…

vote_validator.rb

Fix invalid votes from the API being accepted (#12601)

2020-01-12 14:17:03 +01:00