diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-06-03 14:54:30 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-03 14:54:30 +0200 |
| commit | 76918554a6898f9b94d4ffde07face01754fd058 (patch) | |
| tree | fa394c02128610793353c0a6ba8363d814147ea4 /config/webpack | |
| parent | 35c4ff07f4d61aaf7ade2ae17060298d62b3f643 (diff) | |
| parent | f2f5c1bd6d37ec2ba7d0f98a3c0f8fead6b78f1d (diff) | |
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
Conflicts: - Gemfile.lock - config/webpack/rules/css.js - package.json - yarn.lock
Diffstat (limited to 'config/webpack')
| -rw-r--r-- | config/webpack/rules/css.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/webpack/rules/css.js b/config/webpack/rules/css.js index 9553cb55b..f9b87de9b 100644 --- a/config/webpack/rules/css.js +++ b/config/webpack/rules/css.js @@ -22,7 +22,6 @@ module.exports = { loader: 'sass-loader', options: { includePaths: ['app/javascript'], - fiber: require('fibers'), implementation: require('sass'), sourceMap: true, }, |