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

Merge branch 'develop' into feature/VECTO-1240-hybrid-powertrain 

# Conflicts:
#	VectoCommon/VectoCommon/Models/IResponse.cs
#	VectoCore/VectoCore/Models/Connector/Ports/Impl/Response.cs
#	VectoCore/VectoCore/Models/Simulation/DataBus/IDataBus.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs
#	VectoCore/VectoCore/OutputData/IModalDataContainer.cs
#	VectoCore/VectoCore/OutputData/ModalDataContainer.cs
#	VectoCore/VectoCore/Utils/VectoVersionCore.cs
#	VectoCore/VectoCore/VectoCore.csproj
#	VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj
parents 8a452659 dc523268
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2529 additions and 5354 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