chore(release): 1.2.0 [skip ci]

semantic-release-bot · semantic-release-bot · commit bf40c96e301c · 2020-06-25T16:39:59.000Z
# [1.2.0](v1.1.0...v1.2.0) (2020-06-25) ### 其他 * Merge branch 'master' of https://github.com/d2-projects/electron-vue-template ([395f8c7](395f8c7)) ### 功能 * ✨ Setup qshell ([0529f59](0529f59))
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 规范参考：[Conventional Commits](https://conventionalcommits.org)
 
+# [1.2.0](https://github.com/d2-projects/electron-vue-template/compare/v1.1.0...v1.2.0) (2020-06-25)
+
+
+### 其他
+
+* Merge branch 'master' of https://github.com/d2-projects/electron-vue-template ([395f8c7](https://github.com/d2-projects/electron-vue-template/commit/395f8c7bc0bb63454101b2da064b4e56f417e74a))
+
+
+### 功能
+
+* :sparkles: Setup qshell ([0529f59](https://github.com/d2-projects/electron-vue-template/commit/0529f598ecb0f1950de6c7ae6874645464a2dbd8))
+
 # [1.1.0](https://github.com/d2-projects/electron-vue-template/compare/v1.0.0...v1.1.0) (2020-06-25)
 
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron-vue-template",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "private": true,
   "scripts": {
     "build": "vue-cli-service electron:build",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "electron-vue-template",`
`3`		`- "version": "1.1.0",`
	`3`	`+ "version": "1.2.0",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"build": "vue-cli-service electron:build",`