Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.		2019-03-05 19:23:16 +01:00
..
blacklisted_email_validator.rb
disallowed_hashtags_validator.rb
email_mx_validator.rb
follow_limit_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