Andrin Fassbind f81b031555 Merge remote-tracking branch 'origin/main' into testClass ... # Conflicts: # app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java		2022-05-12 23:31:42 +02:00
..
src	Merge remote-tracking branch 'origin/main' into testClass	2022-05-12 23:31:42 +02:00
build.gradle	change method addPlace	2022-05-12 23:15:42 +02:00