Merge branch 'master' into dev

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "zigbee2mqtt",
-  "version": "1.29.0-dev",
+  "version": "1.29.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "zigbee2mqtt",
-      "version": "1.29.0-dev",
+      "version": "1.29.1",
       "license": "GPL-3.0",
       "dependencies": {
         "ajv": "^8.11.2",
@@ -33,8 +33,13 @@
         "winston-syslog": "^2.7.0",
         "winston-transport": "^4.5.0",
         "ws": "^8.11.0",
+<<<<<<< HEAD
         "zigbee-herdsman": "0.14.84",
         "zigbee-herdsman-converters": "15.0.17",
+=======
+        "zigbee-herdsman": "0.14.83",
+        "zigbee-herdsman-converters": "15.0.12-hotfix.0",
+>>>>>>> master
         "zigbee2mqtt-frontend": "0.6.121"
       },
       "bin": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee2mqtt",
-  "version": "1.29.0-dev",
+  "version": "1.29.1",
   "description": "Zigbee to MQTT bridge using Zigbee-herdsman",
   "main": "index.js",
   "repository": {