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
..
admin.js	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-16 14:50:42 +02:00
common.js	Fixed image require	2017-12-03 23:52:13 -08:00
embed.js	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
mailer.js	Fixed improper mailer import	2018-01-15 21:23:26 -08:00
public.js	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
settings.js	Moved flavour UI into own prefs tab	2017-12-10 20:32:27 -08:00
theme.yml	Fix mailer to use webpack core	2018-01-15 21:17:03 -08:00