c0cef9cd by McLemore

Merge branch 'master' into develop

2 parents 7a660a1a 9521a0d7
...@@ -2,6 +2,13 @@ ...@@ -2,6 +2,13 @@
2 2
3 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. 3 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.
4 4
5 ## [1.2.0](https://gitlab.zb100.com/templates/mui-template/compare/v1.1.0...v1.2.0) (2019-12-17)
6
7
8 ### Features
9
10 * add questions for init ([7a660a1](https://gitlab.zb100.com/templates/mui-template/commit/7a660a1aaf76fbab20447bc4d43e05a0fe136bd6))
11
5 ## 1.1.0 (2019-12-14) 12 ## 1.1.0 (2019-12-14)
6 13
7 14
......
1 { 1 {
2 "name": "@zb100/mui-template", 2 "name": "@zb100/mui-template",
3 "version": "1.1.0", 3 "version": "1.2.0",
4 "lockfileVersion": 1, 4 "lockfileVersion": 1,
5 "requires": true, 5 "requires": true,
6 "dependencies": { 6 "dependencies": {
......
1 { 1 {
2 "name": "@zb100/mui-template", 2 "name": "@zb100/mui-template",
3 "version": "1.1.0", 3 "version": "1.2.0",
4 "description": "小程序组件模版", 4 "description": "小程序组件模版",
5 "main": "index.js", 5 "main": "index.js",
6 "scripts": { 6 "scripts": {
......