Gian-Andrea Hutter 0ca381f8cc Merge branch 'dev' into feature_json-task-db_M2 ...

# Conflicts:
#	src/main/java/module-info.java

2022-10-24 12:53:09 +02:00

..

java

Merge branch 'dev' into feature_json-task-db_M2

2022-10-24 12:53:09 +02:00

resources/ch/zhaw/gartenverwaltung

Added WateringCycle and Pest types

2022-10-23 09:54:56 +02:00