From 60c43466c35047d41d49f5d54b268bdcad2d994f Mon Sep 17 00:00:00 2001
From: zhongzhi107 <zhong.zhi@163.com>
Date: Tue, 15 May 2018 16:30:25 +0800
Subject: [PATCH] chore(release): 3.2.1

---
 CHANGELOG.md      | 10 ++++++++++
 package-lock.json |  2 +-
 package.json      |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3869408..d6f97bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="3.2.1"></a>
+## [3.2.1](https://github.com/packingjs/packing/compare/v3.2.0...v3.2.1) (2018-05-15)
+
+
+### Bug Fixes
+
+* 当母模版名称和路由名称一样时，settings.js 中的master参数无效 ([e96a795](https://github.com/packingjs/packing/commit/e96a795))
+
+
+
 <a name="3.2.0"></a>
 # [3.2.0](https://github.com/packingjs/packing/compare/v3.1.0...v3.2.0) (2018-05-14)
 
diff --git a/package-lock.json b/package-lock.json
index aa3866c..0f4c538 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "packing",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f1e0135..933ab98 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "packing",
   "description": "Webpack based web front-end development environment",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "repository": "packingjs/packing",
   "files": [
     "dist"