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

Skip to content
Snippets Groups Projects
Forked from VECTO / VECTO Sim
9210 commits behind the upstream repository.
Markus QUARITSCH's avatar
Markus Quaritsch authored
Merge branch 'master' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim into develop

Conflicts:
	VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb
	VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
	VectoCore/VectoCore/OutputData/ModalDataContainer.cs
	VectoCore/VectoCore/Utils/VectoCSVFile.cs
	VectoCore/VectoCoreTest/FileIO/JsonTest.cs
0154ad5d
History
Code owners
Assign users and groups as approvers for specific file changes. Learn more.