You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/config/webpack
Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	Vagrantfile
	app/javascript/packs/public.js
	app/views/admin/settings/edit.html.haml
	app/views/settings/preferences/show.html.haml
	app/views/settings/profiles/show.html.haml
	config/locales/es.yml
	config/locales/simple_form.en.yml
	config/webpack/configuration.js
	config/webpack/loaders/babel.js
	package.json
	yarn.lock

Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js
8 years ago
..
loaders Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
configuration.js Fix building assets in test environment 8 years ago
development.js Upgrade webpack to version v4.x (#6655) 8 years ago
generateLocalePacks.js Javascript intl8n flavour support 8 years ago
production.js Upgrade Babel to version 7.0.0 (#5925) 8 years ago
shared.js Reduce assets precompilation time by about 20% 8 years ago
test.js Upgrade webpack to version v4.x (#6655) 8 years ago
translationRunner.js Fix RFC 5646 Regular Expression (#6190) 8 years ago