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		2017-09-09 14:27:47 -05:00
..
loaders	Merge branch 'origin/master' into sync/upstream	2017-09-09 14:27:47 -05:00
configuration.js	Upgrade Webpacker to version 2.0 (#3729)	2017-06-18 02:57:09 +02:00
development.js	Re-add disableHostCheck (regression #3729) (#3854)	2017-06-19 14:01:31 +02:00
generateLocalePacks.js	split added glitch locales from vanilla (#82)	2017-07-16 01:15:25 +02:00
production.js	Remove hash from chunk filename when dev env (#4411)	2017-07-28 05:14:01 +02:00
shared.js	Merge upstream (#111)	2017-08-01 13:20:29 -07:00
test.js	Improve eslint rules (#3147)	2017-05-20 17:31:47 +02:00
translationRunner.js	Fix regular expression for RFC 5646 (regression from #3604) (#4133)	2017-07-10 14:02:18 +02:00