Merge remote-tracking branch 'origin/feature_cropsAndTaskGUI_M2' into feature_cropsAndTaskGUI_M2

Browse Source

# Conflicts:
#	src/main/java/ch/zhaw/gartenverwaltung/CropDetailController.java
#	src/main/java/ch/zhaw/gartenverwaltung/MyPlantsController.java
#	src/main/java/ch/zhaw/gartenverwaltung/MyScheduleController.java
#	src/main/resources/ch/zhaw/gartenverwaltung/CropDetail.fxml

...

This commit is contained in:

giavaphi 2022-11-08 21:08:23 +01:00

parent ced2645bd7 ea4a1ecc6a

commit 0e40bc6304

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available