diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-02-20 15:15:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-20 15:15:27 +0100 |
| commit | 0becd88feb63de6ac02b495ad1440d8bd7cdcbd2 (patch) | |
| tree | 34dd018ce6dc0733281e58cda60df12994830aaf /webpack.common.js | |
| parent | 82625e2a45e4ad136071d064ed33232773084d11 (diff) | |
| parent | a32df521f2f6a6009cae37c0d1f6e0be90f18f56 (diff) | |
| download | nextcloud-server-0becd88feb63de6ac02b495ad1440d8bd7cdcbd2.tar.gz nextcloud-server-0becd88feb63de6ac02b495ad1440d8bd7cdcbd2.zip | |
Merge pull request #14297 from nextcloud/enh/settings_to_main_webpack
Move settings to main webpack
Diffstat (limited to 'webpack.common.js')
| -rw-r--r-- | webpack.common.js | 5 |
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, |