Merge branch 'master' into dev/reqif
authorandre ebersold <andre.ebersold@siemens.com>
Tue, 11 Jun 2024 12:23:45 +0000 (14:23 +0200)
committerandre ebersold <andre.ebersold@siemens.com>
Tue, 11 Jun 2024 12:23:45 +0000 (14:23 +0200)
commitb5940c2cb81054b64975f9af6bfd2046bee9f6b5
tree08c57cebb388ed8d21fffdd15efbf3b6862be408
parente3c0b9d5bbec3f4a2ca931a3dccc2db6ca636857
parent9ff155e8079c4c0cad832c055998774aa7f7e2b2
Merge branch 'master' into dev/reqif

# Conflicts:
# .gitignore
.gitignore