Thibaut Girka 44f2224606 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		2019-01-02 15:36:53 +01:00
..
blacklisted_email_validator_spec.rb	Add specs for BlackListedEmailValidator (#9651)	2018-12-29 07:23:44 +01:00
disallowed_hashtags_validator_spec.rb	Add specs for DisallowedHashtagsValidator (#9653)	2018-12-29 07:22:51 +01:00
email_mx_validator_spec.rb	Improve e-mail MX validator and add tests (#9489)	2018-12-10 22:53:25 +01:00
follow_limit_validator_spec.rb	Add specs for FollowLimitValidator (#9655)	2018-12-29 08:24:52 +01:00
status_length_validator_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-02 15:36:53 +01:00
status_pin_validator_spec.rb	Add specs for StatusPinValidator (#9648)	2018-12-28 18:09:32 +09:00
unique_username_validator_spec.rb	Remove pending spec (#9454)	2018-12-07 16:38:50 +01:00