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
..
frontends	Multiple frontend support (#110)	7 years ago
about.js	Require any modules after loading polyfill in entry points (#4231)	7 years ago
admin.js	Improve admin page (#4121)	7 years ago
application.js	Multiple frontend support (#110)	7 years ago
common.js	Multiple frontend support (#110)	7 years ago
custom.js	adding cybre changes	7 years ago
public.js	Merge branch 'origin/master' into sync/upstream	7 years ago
share.js	Add protocol handler. Handle follow intents (#4511)	7 years ago