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/loaders
Thibaut Girka f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	Dockerfile
	app/javascript/packs/common.js
	config/webpack/loaders/sass.js
	config/webpack/shared.js
	db/schema.rb
	package.json
	yarn.lock

A lot of the conflicts come from updating webpack.

Even though upstream deleted app/javascript/packs/common.js, I kept
glitch-soc's version as it unifies JS/CSS packs behavior across flavours.

Ported glitch changes to webpack 4.x
7 years ago
..
assets.js
babel.js Merge upstream 2.0ish #165 8 years ago
babel_external.js Remove prop types from external libraries (#5304) 8 years ago
mark.js
sass.js Merge branch 'master' into glitch-soc/merge-upstream 7 years ago