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 b9f7bc149b 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
..
_follow_grid.html.haml	Optimize follower_accounts and following_accounts (#2820)	7 years ago
_grid_card.html.haml	Redesign public profiles (#4608)	7 years ago
_header.html.haml	Merge branch 'origin/master' into sync/upstream	7 years ago
_nothing_here.html.haml	Localizations for most server-side strings	8 years ago
_og.html.haml	Add og:url tags (#2298)	7 years ago
show.html.haml	Pinned statuses (#4675)	7 years ago