Merge branch 'master' into develop

This commit is contained in:
Nico Rehwaldt 2020-06-05 11:52:11 +02:00
commit d1ae29a21e
4 changed files with 7 additions and 2 deletions

3
.github/merge-me.yml vendored Normal file
View File

@ -0,0 +1,3 @@
reviewTeams:
- modeling-dev
- modeling-design

View File

@ -6,6 +6,8 @@ All notable changes to [bpmn-js](https://github.com/bpmn-io/bpmn-js) are documen
___Note:__ Yet to be released changes appear here._
## 7.0.0
* `FEAT`: make import and export APIs awaitable ([#812](https://github.com/bpmn-io/bpmn-js/issues/812))
* `FEAT`: update watermark ([#1281](https://github.com/bpmn-io/bpmn-js/pull/1281))
* `CHORE`: deprecated `import.parse.complete` context payload ([`157aec6e`](https://github.com/bpmn-io/bpmn-js/commit/157aec6e))

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "bpmn-js",
"version": "7.0.0-beta.0",
"version": "7.0.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@ -1,6 +1,6 @@
{
"name": "bpmn-js",
"version": "7.0.0-beta.0",
"version": "7.0.0",
"description": "A bpmn 2.0 toolkit and web modeler",
"scripts": {
"all": "run-s lint test distro test:distro",