resolve conflicts, merge master

2025-07-02 02:42:34 -04:00 · 2023-08-15 20:58:24 +12:00 · 2023-08-15 20:58:24 +12:00 · e5e82032eb
commit e5e82032eb
parent 6a375c62a8 6ed9d4554a
24 changed files with 1111 additions and 1548 deletions
--- a/Gruntfile.js
+++ b/Gruntfile.js
@ -197,6 +197,7 @@ module.exports = function (grunt) {
        },
        webpack: {
            options: webpackConfig,
+            myConfig: webpackConfig,
            web: webpackProdConf(),
        },
        "webpack-dev-server": {