Kim 1ed3a64ade Merge remote-tracking branch 'origin/main' ... # Conflicts: # typescript/Frontend/src/components/Context/S3CredentialsContextProvider.tsx		2023-07-27 13:23:52 +02:00
..
App	Merge remote-tracking branch 'origin/main'	2023-07-27 13:23:52 +02:00
Lib	add roundto to unixTime	2023-07-24 10:55:58 +02:00
InnovEnergy.props	Add Rootnamespace property in project files	2023-07-03 14:59:59 +02:00
InnovEnergy.sln	updates to backend and 10.2.0.1	2023-07-27 13:23:17 +02:00
InnovEnergy.sln.DotSettings	make dictionary grow	2023-06-20 10:23:42 +02:00
global.json	change the target framework to net6.0	2023-06-30 10:25:14 +02:00