summaryrefslogtreecommitdiffstats
path: root/webpack.common.js
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2019-02-20 09:06:56 +0100
committerJulius Härtl <jus@bitgrid.net>2019-02-20 12:52:39 +0100
commit90dcefb94f2110b4048400d7e4befc0f02178955 (patch)
tree33477b6913650c1c01eebbaaf73715cd08d65d03 /webpack.common.js
parent7f49a2cb63d979932890dd9fb296e9b8f27405cd (diff)
downloadnextcloud-server-90dcefb94f2110b4048400d7e4befc0f02178955.tar.gz
nextcloud-server-90dcefb94f2110b4048400d7e4befc0f02178955.zip
Move settings to main webpack
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'webpack.common.js')
-rw-r--r--webpack.common.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/webpack.common.js b/webpack.common.js
index f9bd904b899..816acb4834a 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -1,4 +1,6 @@
-const core = require('./core/webpack');
+const core = require('./core/webpack')
+const settings = require('./settings/webpack')
+
const accessibility = require('./apps/accessibility/webpack')
const files_sharing = require('./apps/files_sharing/webpack')
const files_trashbin = require('./apps/files_trashbin/webpack')
@@ -9,6 +11,7 @@ const updatenotifications = require('./apps/updatenotification/webpack')
module.exports = [].concat(
core,
+ settings,
accessibility,
files_sharing,
files_trashbin,