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 5609946b authored by Michael KRISPER's avatar Michael KRISPER
Browse files

Merge remote-tracking branch 'origin/develop' into...

Merge remote-tracking branch 'origin/develop' into bugfix/VECTO-1490-exceeded-max-iterations-operating-point-could-not-be-found

# Conflicts:
#	VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs
#	VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs
#	VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
parents 571c39a9 866e1467
Branches
Tags
No related merge requests found
Showing
with 494 additions and 293 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment