OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity
mastodon/app/javascript/packs
History
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
 		2018-07-16 14:50:42 +02:00
..
about.js Upgrade webpack to version v4.x (#6655) 2018-07-14 03:56:41 +02:00
application.js Upgrade webpack to version v4.x (#6655) 2018-07-14 03:56:41 +02:00
common.js Upgrade webpack to version v4.x (#6655) 2018-07-14 03:56:41 +02:00
public.js Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
share.js Upgrade webpack to version v4.x (#6655) 2018-07-14 03:56:41 +02:00