Merge upstream (#111)

1 files changed, 0 insertions, 21 deletions

diff --git a/storybook/webpack.config.js b/storybook/webpack.config.js
deleted file mode 100644
index e16910b29..000000000
--- a/storybook/webpack.config.js
+++ /dev/null
@@ -1,21 +0,0 @@
-const path = require('path');
-
-module.exports = {
-  module: {
-    rules: [
-      {
-        test: /\.(jpg|jpeg|png|gif|svg|eot|ttf|woff|woff2)$/i,
-        loader: 'url-loader',
-      },
-      {
-        test: /.scss$/,
-        loaders: ['style-loader', 'css-loader', 'postcss-loader', 'sass-loader'],
-      },
-    ],
-  },
-  resolve: {
-    alias: {
-      mastodon: path.resolve(__dirname, '..', 'app', 'javascript', 'mastodon'),
-    },
-  },
-};