Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.		2018-07-09 07:13:59 +02:00
..
blacklisted_email_validator.rb
disallowed_hashtags_validator.rb	Implement the ability for instances to define a list of disallowed hashtags (#7176)	2018-04-23 23:52:58 +02:00
email_mx_validator.rb	In e-mail validator, fallback from MX to A record (#7955)	2018-07-05 20:57:24 +02:00
status_length_validator.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-02-04 16:36:19 -06:00
status_pin_validator.rb	Allow more than the max pins if account is not local (#7105)	2018-04-12 20:36:02 +02:00
unique_username_validator.rb	Fix UniqueUsernameValidator comparison (#6926)	2018-03-27 04:33:57 +02:00
unreserved_username_validator.rb	pam authentication (#5303)	2018-02-02 10:18:55 +01:00
url_validator.rb