mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-09 16:35:48 +00:00
659b8a12ec
Conflicts: config/locales/ca.yml config/locales/nl.yml config/locales/oc.yml config/locales/pt-BR.yml Resolved conflicts by removing upstream-specific changes |
||
---|---|---|
.. | ||
blacklisted_email_validator.rb | ||
disallowed_hashtags_validator.rb | ||
email_mx_validator.rb | ||
status_length_validator.rb | ||
status_pin_validator.rb | ||
unique_username_validator.rb | ||
unreserved_username_validator.rb | ||
url_validator.rb |