This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb		2019-05-04 16:37:26 +02:00
..
blacklisted_email_validator.rb	…
disallowed_hashtags_validator.rb	…
email_mx_validator.rb	…
existing_username_validator.rb	…
follow_limit_validator.rb	…
html_validator.rb	…
note_length_validator.rb	…
poll_validator.rb	…
status_length_validator.rb	…
status_pin_validator.rb	…
unique_username_validator.rb	…
unreserved_username_validator.rb	…
url_validator.rb	…
vote_validator.rb	…