Merge branch 'main' of https://git.belevo.ch/dh/Symcon_Belevo_Energiemanagement_testing

# Conflicts: # library.json
2024-12-17 15:01:53 +01:00
parent b18cb5831a 04d67d2e0d
commit db45907791
5 changed files with 245 additions and 0 deletions
--- a/library.json
+++ b/library.json
@@ -6,7 +6,11 @@
    "compatibility": {
        "version": "7.1"
    },
+<<<<<<< HEAD
    "version": "0.173",
+=======
+    "version": "0.189",
+>>>>>>> 04d67d2e0d688a8c20edd9a347dad2b09ea62229
    "build": 0,
    "date": 0
 }