Merge branch 'develop' into master
# Conflicts: # package.json
| Name | Stage | Failure | ||
|---|---|---|---|---|
|
failed
|
publish | Build | ||
|
||||
|
failed
|
build | Build | ||
|
||||
# Conflicts: # package.json
| Name | Stage | Failure | ||
|---|---|---|---|---|
|
failed
|
publish | Build | ||
|
||||
|
failed
|
build | Build | ||
|
||||