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
..
applications	Add label for application scopes (#4691)	7 years ago
deletes	Fix autocomplete option in haml files (#4438)	7 years ago
exports	Settings export refactor (#1646)	8 years ago
follower_domains	Followers-only post federation (#2111)	8 years ago
imports	Optimize user setting page for mobile browser (#1924)	8 years ago
preferences	Add unfollow modal (optional) (#4246)	7 years ago
profiles	Merge that good fresh upstream shit	7 years ago
shared	2FA controller cleanup (#2296)	8 years ago
two_factor_authentication	Fix autocomplete option in haml files (#4438)	7 years ago
two_factor_authentications	Fix autocomplete option in haml files (#4438)	7 years ago