Merge branch 'master' into BackendRefactor

2017-05-14 17:42:14 +08:00
parent 0c619fee91 f85d1d8801
commit c37b666915
10 changed files with 246 additions and 220 deletions
--- a/package.json
+++ b/package.json
@@ -164,6 +164,7 @@
    "optimize-css-assets-webpack-plugin": "^1.3.0",
    "script-loader": "^0.7.0",
    "standard": "^9.0.1",
+    "string-loader": "^0.0.1",
    "style-loader": "^0.13.1",
    "url-loader": "^0.5.7",
    "webpack": "^1.14.0",