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
..
contrast	…
fonts	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-16 14:50:42 +02:00
mastodon-light	Revert "Fix dark background error on user-mention autosuggest (#7937)" (#7964)	2018-07-06 13:19:18 +02:00
application.scss	Add white outline to black emojis (fix #5083) (#7936)	2018-07-04 17:35:02 +02:00
contrast.scss	…
mailer.scss	…
mastodon-light.scss	…
win95.scss	…