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
..
_mixins.scss
about.scss
accessibility.scss
accounts.scss
admin.scss
basics.scss
boost.scss
compact_header.scss
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-16 14:50:42 +02:00
containers.scss
emoji_picker.scss
footer.scss
forms.scss
landing_strip.scss
lists.scss
modal.scss
reset.scss
rtl.scss
stream_entries.scss
tables.scss
variables.scss