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

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

Merge branch 'develop' into feature/VECTO-1579-create-json-filewriter-for-iepc

# Conflicts:
#	VECTO/File Browser/FileBrowserModule.vb
#	VECTO/GUI/MainForm.Designer.vb
#	VECTO/GUI/MainForm.vb
#	VECTO/GUI/VehicleForm.Designer.vb
#	VECTO/GUI/VehicleForm.vb
#	VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
parents 186344ad 53fb8997
No related branches found
No related tags found
No related merge requests found
Showing
with 4708 additions and 2408 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