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
..
loaders	Merge branch 'origin/master' into sync/upstream	7 years ago
configuration.js	Upgrade Webpacker to version 2.0 (#3729)	8 years ago
development.js	Re-add disableHostCheck (regression #3729) (#3854)	8 years ago
generateLocalePacks.js	split added glitch locales from vanilla (#82)	7 years ago
production.js	Remove hash from chunk filename when dev env (#4411)	7 years ago
shared.js	Merge upstream (#111)	7 years ago
test.js	Improve eslint rules (#3147)	8 years ago
translationRunner.js	Fix regular expression for RFC 5646 (regression from #3604) (#4133)	7 years ago