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

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

Merge branch 'vecto-cert/develop' into dev/AMT_ShiftStrategy 

# Conflicts:
#	VectoCommon/VectoCommon/Properties/Version.cs
#	VectoCommon/VectoHashing/Properties/Version.cs
#	VectoConsole/Properties/Version.cs
#	VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs
#	VectoCore/VectoCore/Properties/Version.cs
#	VectoCore/VectoCore/Utils/VectoVersionCore.cs
#	VectoCore/VectoCore/VersionNumber.t4
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj
parents e3e9a604 44f4fa03
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 9389 additions and 303 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