refs/heads/master - gerrit/basyx/basyx

commit: 7f129111090a5022f16bf60c28b554b2a3243b37

[log]
author: Constantin Ziesche <constantin.ziesche@bosch.com>

Tue Jul 06 12:00:15 2021 +0200
committer: Constantin Ziesche <constantin.ziesche@bosch.com>

Tue Jul 06 12:00:15 2021 +0200
tree: 4b2fc6b45a89c8ddff4a8566ec77f354ba6e786a
parent: aabdeccb8c0baf47a3b066882f0fa3a74cbfd189 [diff]
parent: beb198715e2629b1845a5d040d43a84dadca89c9 [diff]

Merge branch 'master' of https://git.eclipse.org/r/basyx/basyx

# Conflicts:
#	.gitignore

tree: 4b2fc6b45a89c8ddff4a8566ec77f354ba6e786a