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

Skip to content
Snippets Groups Projects
Commit 2f89e79f authored by Michael KRISPER's avatar Michael KRISPER
Browse files

Merge remote-tracking branch 'vecto/develop' into develop

# Conflicts:
#	VectoCore/VectoCore/InputData/Reader/ComponentData/TorqueConverterDataReader.cs
parents 1b410c6a bd7b1a76
No related branches found
No related tags found
No related merge requests found
Showing
with 129 additions and 62 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