diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-02-13 11:34:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-13 11:34:48 +0100 |
| commit | 3d804ea15d0c8fd223ea9ff698c7fec70d420b35 (patch) | |
| tree | df0c23636f6c33fe80d988ea5b83129f2d6d1d9c /webpack.common.js | |
| parent | eab46d1ab151d87f8ddbe50b8719f22c7e5ec765 (diff) | |
| parent | 58ecc7d000e682df51c14562f369900dcd0f1eec (diff) | |
| download | nextcloud-server-3d804ea15d0c8fd223ea9ff698c7fec70d420b35.tar.gz nextcloud-server-3d804ea15d0c8fd223ea9ff698c7fec70d420b35.zip | |
Merge pull request #14141 from nextcloud/enh/trashbin_to_webpack
Move files_trashbin to webpack
Diffstat (limited to 'webpack.common.js')
| -rw-r--r-- | webpack.common.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webpack.common.js b/webpack.common.js index 117c6197916..9a117ba4b3c 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -1,4 +1,5 @@ const core = require('./core/webpack'); +const files_trashbin = require('./apps/files_trashbin/webpack') const oauth2 = require('./apps/oauth2/webpack') -module.exports = [].concat(core, oauth2); +module.exports = [].concat(core, files_trashbin, oauth2); |