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

Skip to content
Snippets Groups Projects
Commit 8717f6b8 authored by Michael KRISPER's avatar Michael KRISPER
Browse files

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

# Conflicts:
#	VectoCore/VectoCore/Models/SimulationComponent/VectoSimulationComponent.cs
#	VectoCore/VectoCoreTest/Reports/ModDataTest.cs
parents cb47f758 8b0a70ee
No related branches found
No related tags found
No related merge requests found
Showing
with 269 additions and 887 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