Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 571c7169 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Merge branch 'develop' into feature/VECTO-1240_hybrid-P0_with_APT 

# Conflicts:
#	VectoCommon/VectoCommon/Models/HybridStrategyResponse.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
parents dfceb593 caddb506
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 150 additions and 78 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about