You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb		6 years ago
..
blacklisted_email_validator_spec.rb	Change e-mail whitelist/blacklist to not be checked when invited (#10683)	6 years ago
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	…