diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-01-06 18:08:06 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-01-06 18:08:06 +0100 |
commit | 90528f43bc988bac8c8280e917531f7505027570 (patch) | |
tree | 6143b81902af21aff93a1dc40b2a2eff3593735b /app/javascript/flavours/glitch/styles/components/doodle.scss | |
parent | 225c934a1b66e2fcbedbda7936666c1ca3c9a04b (diff) | |
parent | 69763b6385250902fdb329d030457159976f70ed (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `config/webpack/configuration.js`: Upstream updated the `js-yaml` dependency, which changed how to call it. Those changes conflicted because that code is pretty different in glitch-soc which has to deal with its more complex theming system. Proceeded to the same compatibility changes in glitch-soc's code. - `package.json` and `yarn.lock`: Not really a conflict, just glitch-soc-specific dependencies textually too close to some dependencies updated upstream.
Diffstat (limited to 'app/javascript/flavours/glitch/styles/components/doodle.scss')
0 files changed, 0 insertions, 0 deletions