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.

David Yip da3f22ee7d Merge branch 'origin/master' into sync/upstream ... Conflicts: app/javascript/mastodon/components/status_list.js app/javascript/mastodon/features/notifications/index.js app/javascript/mastodon/features/ui/components/modal_root.js app/javascript/mastodon/features/ui/components/onboarding_modal.js app/javascript/mastodon/features/ui/index.js app/javascript/styles/about.scss app/javascript/styles/accounts.scss app/javascript/styles/components.scss app/presenters/instance_presenter.rb app/services/post_status_service.rb app/services/reblog_service.rb app/views/about/more.html.haml app/views/about/show.html.haml app/views/accounts/_header.html.haml config/webpack/loaders/babel.js spec/controllers/api/v1/accounts/credentials_controller_spec.rb		7 years ago
..
blacklisted_email_validator.rb	Correct validators so that existing error messages would look correct (#3668)	7 years ago
status_length_validator.rb	Merge upstream (#111)	7 years ago
status_pin_validator.rb	Pinned statuses (#4675)	7 years ago
unreserved_username_validator.rb	Correct validators so that existing error messages would look correct (#3668)	7 years ago
url_validator.rb	Punycode URI normalization (#2370)	8 years ago