Nassim Jahnke 448f452965 Merge remote-tracking branch 'origin/master' into dev ... # Conflicts: # gradle/libs.versions.toml		2021-10-07 15:33:06 +02:00
..
wrapper	Update Gradle to 7.2	2021-08-17 13:39:55 +02:00
libs.versions.toml	Merge remote-tracking branch 'origin/master' into dev	2021-10-07 15:33:06 +02:00