26538637 by McLemore

Merge branch 'master' into develop

2 parents cbb96f3e 55b246ee
...@@ -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.3.2](https://gitlab.zb100.com/templates/mui-template/compare/v1.3.1...v1.3.2) (2020-02-08)
6
7
8 ### Bug Fixes
9
10 * 指定fsevents版本号为1.2.9 ([cbb96f3](https://gitlab.zb100.com/templates/mui-template/commit/cbb96f3ebf4d7f288c3dd4795501bf5e67a98b2f))
11
5 ### [1.3.1](https://gitlab.zb100.com/templates/mui-template/compare/v1.3.0...v1.3.1) (2019-12-20) 12 ### [1.3.1](https://gitlab.zb100.com/templates/mui-template/compare/v1.3.0...v1.3.1) (2019-12-20)
6 13
7 ## [1.3.0](https://gitlab.zb100.com/templates/mui-template/compare/v1.2.2...v1.3.0) (2019-12-17) 14 ## [1.3.0](https://gitlab.zb100.com/templates/mui-template/compare/v1.2.2...v1.3.0) (2019-12-17)
......
1 { 1 {
2 "name": "@zb100/mui-template", 2 "name": "@zb100/mui-template",
3 "version": "1.3.1", 3 "version": "1.3.2",
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.3.1", 3 "version": "1.3.2",
4 "description": "小程序组件模版", 4 "description": "小程序组件模版",
5 "main": "index.js", 5 "main": "index.js",
6 "scripts": { 6 "scripts": {
......