Merge branch 'master' into cn (#459)

docschina · Mar 5, 2018 · c3d798b · c3d798b
1 parent f0cad0a
commit c3d798b
Show file tree

Hide file tree

Showing 21 changed files with 16,396 additions and 33 deletions.
diff --git a/UPDATE.md b/UPDATE.md
@@ -3,3 +3,7 @@
 ### 2018.01.13
 * 合并记录：合并 master 分支
 * 合并记录：https://github.com/webpack-china/webpack.js.org/pull/433
+
+### 2018.03.5
+* 合并记录：合并 master 分支
+* 合并记录：https://github.com/webpack-china/webpack.js.org/pull/459