Sebastian Stenzel 9f0e269baf Merge branch 'develop' into feature/hub ...

# Conflicts:
#	pom.xml
#	src/main/resources/license/THIRD-PARTY.txt

2022-04-28 12:55:55 +02:00

..

resources

updated license templates

2022-04-22 12:34:25 +02:00

.gitignore

updated license template for macos, fixed manual build script

2022-04-14 13:52:10 +02:00

build.sh

Merge branch 'develop' into feature/hub

2022-04-28 12:55:55 +02:00