00fcdebed7
Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting. |
||
---|---|---|
.. | ||
blacklisted_email_validator.rb | ||
disallowed_hashtags_validator.rb | ||
email_mx_validator.rb | ||
follow_limit_validator.rb | ||
status_length_validator.rb | ||
status_pin_validator.rb | ||
unique_username_validator.rb | ||
unreserved_username_validator.rb | ||
url_validator.rb |