You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream ... 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		6 years ago
..
blacklisted_email_validator_spec.rb	Add specs for BlackListedEmailValidator (#9651)	6 years ago
disallowed_hashtags_validator_spec.rb	Add specs for DisallowedHashtagsValidator (#9653)	6 years ago
email_mx_validator_spec.rb	Improve e-mail MX validator and add tests (#9489)	6 years ago
follow_limit_validator_spec.rb	Add specs for FollowLimitValidator (#9655)	6 years ago
status_length_validator_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
status_pin_validator_spec.rb	Add specs for StatusPinValidator (#9648)	6 years ago
unique_username_validator_spec.rb	Remove pending spec (#9454)	6 years ago