Merge branch 'feature_notification_m3' into feature_weather

Browse Source

# Conflicts:
#	src/main/java/ch/zhaw/gartenverwaltung/bootstrap/AppLoader.java

...

This commit is contained in:

schrom01

2022-11-29 11:41:28 +01:00

parent f43bfeebd2 220d138185

commit 1faf1c10de

12 changed files with 240 additions and 2 deletions

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

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

src/main/resources/META-INF/javamail.default.address.map