merge conflicts from 05.04

This commit is contained in:
Shailen Sobhee 2026-04-05 19:08:01 +02:00
commit 3271327208
7 changed files with 59 additions and 14 deletions

View file

@ -1 +1 @@
2.5.0
3.0.10

View file

@ -8,9 +8,9 @@
<meta name="apple-mobile-web-app-title" content="ESPSomfy RTS App">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<link rel="stylesheet" href="main.css" type="text/css" />
<link rel="stylesheet" href="widgets.css" type="text/css" />
<link rel="stylesheet" href="icons.css" type="text/css" />
<link rel="stylesheet" href="main.css?v=3.0.10c" type="text/css" />
<link rel="stylesheet" href="widgets.css?v=3.0.10c" type="text/css" />
<link rel="stylesheet" href="icons.css?v=3.0.10c" type="text/css" />
<link rel="icon" type="image/png" href="favicon.png" />
<!-- iPad retina icon -->
@ -114,7 +114,7 @@
rel="apple-touch-startup-image">
<script type="text/javascript" src="index.js"></script>
<script type="text/javascript" src="index.js?v=3.0.10c"></script>
</head>
<body>
<div id="divContainer" class="container main" data-auth="false">