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

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

Merge branch 'develop' into feature/VECTO-366-ems-vehicles

Conflicts:
	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
	VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
parents 11470742 263f14de
No related branches found
No related tags found
Loading
Showing
with 101 additions and 28 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