Merge branch 'master' into webpack-frontend

2016-10-11 18:39:15 +08:00
parent 21028c5773 cd9f8fe36b
commit 6e651c8108
527 changed files with 2584 additions and 601 deletions
--- a/webpackBaseConfig.js
+++ b/webpackBaseConfig.js
@@ -41,7 +41,8 @@ module.exports = {
            "expose?LZString!lz-string",
            "expose?filterXSS!xss",
            "js-url",
-            "bootstrap"
+            "bootstrap",
+            "expose?ListPagination!list.pagination.js/dist/list.pagination.js"
        ]
    },