Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 6bc8f124 authored by Michael KRISPER's avatar Michael KRISPER
Browse files

Merge branch 'develop' into feature/VECTO-79-add-jobcontainer-or-similar

Conflicts:
	VectoCore/Models/SimulationComponent/Data/Engine/FullLoadCurve.cs
	VectoCoreTest/VectoCoreTest.csproj
parents e1641fc7 6d84b995
Branches
Tags
No related merge requests found
Showing
with 322 additions and 62 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment