mastodon/app
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
..
chewy
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
mailers
models Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
presenters
serializers Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
validators Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
workers Add federation relay support (#7998) 2018-07-13 02:16:06 +02:00