mirror of
https://github.com/funamitech/mastodon
synced 2024-12-12 05:39:02 +09:00
571d219bb9
Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock |
||
---|---|---|
.. | ||
blacklisted_email_validator_spec.rb | ||
disallowed_hashtags_validator_spec.rb | ||
email_mx_validator_spec.rb | ||
follow_limit_validator_spec.rb | ||
status_length_validator_spec.rb | ||
status_pin_validator_spec.rb | ||
unique_username_validator_spec.rb |