Andrin Fassbind 418f583955 Merge remote-tracking branch 'origin/logging_and_docs' into testing ... # Conflicts: # app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java # app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java # app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/LogConfiguration.java # app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java # app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java # app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/AlertNewSchedule.java # app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java		2022-05-13 22:53:30 +02:00
..
src	Merge remote-tracking branch 'origin/logging_and_docs' into testing	2022-05-13 22:53:30 +02:00
build.gradle	change method addPlace	2022-05-12 23:15:42 +02:00