Kim f1394e4755 Merge remote-tracking branch 'origin/main' ... # Conflicts: # csharp/App/Backend/Database/User.cs # csharp/App/Backend/Model/User.cs		2023-03-09 12:52:47 +01:00
..
App	Merge remote-tracking branch 'origin/main'	2023-03-09 12:52:47 +01:00
Lib	lift AMPT to new StatusApi	2023-03-09 12:40:47 +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