Kim e4dd24c1b0 Merge remote-tracking branch 'origin/main' ... # Conflicts: # csharp/App/Backend/DataTypes/Methods/User.cs # csharp/App/Backend/Database/Db.cs		2023-03-16 10:33:23 +01:00
..
App	Merge remote-tracking branch 'origin/main'	2023-03-16 10:33:23 +01:00
Lib	implement Logic/Wire addressing in ModbusClients	2023-03-10 13:57:39 +01:00
InnovEnergy.props	fix replace, so it works on windows as well	2023-03-01 09:41:49 +01:00
InnovEnergy.sln	Add missing .generated.cs files.	2023-02-26 15:43:53 +01:00
InnovEnergy.sln.DotSettings	implement | (parallel) operator in StatusApi.csproj	2023-03-01 08:07:26 +01:00
global.json	Restructure EmuMeter Status and add AvgBatteries file	2023-02-23 16:32:06 +01:00