David Yip c816701550 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: .travis.yml Gemfile.lock README.md app/controllers/settings/follower_domains_controller.rb app/controllers/statuses_controller.rb app/javascript/mastodon/locales/ja.json app/lib/feed_manager.rb app/models/media_attachment.rb app/models/mute.rb app/models/status.rb app/services/mute_service.rb app/views/home/index.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/ca.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/nl.yml config/locales/pl.yml config/locales/pt-BR.yml config/themes.yml		2018-05-03 17:23:44 -05:00
..
blacklisted_email_validator.rb	Implement EmailBlackList (#5109)	2017-10-04 15:16:10 +02:00
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
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