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 7d631e4a authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Merge branch 'feature/VECTO-1240_hybrid-without-buses' into feature/VECTO-1240-hybrid-powertrain

# Conflicts:
#	VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
parents 39823a4a 4072ee9c
No related branches found
No related tags found
No related merge requests found
Showing
with 1094 additions and 277 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment