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

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

Merge branch 'develop' into hotfix/VECTO-270-input-data-parsing-not-language 

Conflicts:
	VECTO/GUI/F_MAINForm.vb
	VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AuxDemandTest.cs
	VectoCore/VectoCoreTest/Integration/BusAuxiliaries/BusAdapterTest.cs
parents 4e120b7f 83917874
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1035 additions and 926 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