Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 5ab01323 authored by Harald Martini's avatar Harald Martini
Browse files

Merge branch 'develop' into merge_1503_develop_27_04_22

# Conflicts:
#	VectoCommon/VectoCommon/Models/PowertrainPosition.cs
#	VectoCommon/VectoCommon/VectoCommon.csproj
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationHeavyLorryVehicleDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationPrimaryBusVehicleDataProvider.cs
#	VectoCore/VectoCore/VectoCore.csproj
#	VectoCore/VectoCore/packages.config
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj
parents 076fe6c2 036ab56d
No related branches found
No related tags found
No related merge requests found
Showing
with 276 additions and 1309 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment