Merge branch 'master' into develop

CHANGELOG.md

@@ -6,6 +6,10 @@ All notable changes to [bpmn-js](https://github.com/bpmn-io/bpmn-js) are documen
 
 ___Note:__ Yet to be released changes appear here._
 
+## 7.4.1
+
+* `FIX`: correct keyboard zoom in key on international keyboard shortcuts ([#1362](https://github.com/bpmn-io/bpmn-js/issues/1362))
+
 ## 7.4.0
 
 * `CHORE`: bump to `diagram-js@6.8.0`

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-js",
-  "version": "7.4.0",
+  "version": "7.4.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2027,9 +2027,9 @@
       "dev": true
     },
     "diagram-js": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-6.8.0.tgz",
-      "integrity": "sha512-dB1AAnzAOeNycF/gQrJe93NxMtVwZULzv0jP0Lp4c3qfxse2cnDnRp5h8SVeFgKNjryLD4y+zYKy4L1QV3S+9w==",
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-6.8.1.tgz",
+      "integrity": "sha512-sJBvgrWnFLKzuw0DmqRt9aM3dFQP5Y5HpE5yIf1NFbB5rqVoiM7TvDp1+IsANA05v7exzC7AxZkdutWuaOFI/A==",
       "requires": {
         "css.escape": "^1.5.1",
         "didi": "^4.0.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-js",
-  "version": "7.4.0",
+  "version": "7.4.1",
   "description": "A bpmn 2.0 toolkit and web modeler",
   "scripts": {
     "all": "run-s lint test distro test:distro",
@@ -84,7 +84,7 @@
   "dependencies": {
     "bpmn-moddle": "^7.0.3",
     "css.escape": "^1.5.1",
-    "diagram-js": "^6.8.0",
+    "diagram-js": "^6.8.1",
     "diagram-js-direct-editing": "^1.6.1",
     "ids": "^1.0.0",
     "inherits": "^2.0.1",