Merge branch 'develop' into feature/hub

# Conflicts:
#	pom.xml
#	src/main/resources/license/THIRD-PARTY.txt
This commit is contained in:
Sebastian Stenzel
2022-04-28 12:55:55 +02:00
83 changed files with 1296 additions and 980 deletions
@@ -66,6 +66,7 @@
</content_rating>
<releases>
<release date="2022-04-27" version="1.6.9"/>
<release date="2022-03-30" version="1.6.8"/>
<release date="2021-12-16" version="1.6.5"/>
</releases>