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

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

Merge branch 'develop' of... 

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/vecto/vecto-dev into feature/VECTO-975-implementing-eco-roll-with-and-without-engine-stop

# Conflicts:
#	HashingTool/Properties/Version.cs
#	VectoCommon/VectoCommon/Properties/Version.cs
#	VectoCommon/VectoCommon/Resources/XMLNames.resx
#	VectoCommon/VectoHashing/Properties/Version.cs
#	VectoConsole/Properties/Version.cs
#	VectoCore/VectoCore/OutputData/ModalDataContainer.cs
#	VectoCore/VectoCore/VersionNumber.t4
parents 8bfce2b0 7b06dd11
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 366 additions and 90 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