Nassim Jahnke 448f452965 Merge remote-tracking branch 'origin/master' into dev ... # Conflicts: # gradle/libs.versions.toml		2021-10-07 15:33:06 +02:00
..
src/main	Merge remote-tracking branch 'origin/master' into dev	2021-10-07 15:33:06 +02:00
build.gradle.kts	Update build scripts	2021-05-29 09:32:55 +02:00