Merge branch 'develop' into 'GradleUmstellung'
# Conflicts: # src/main/java/de/bsvrz/dua/progglaette/package-info.java # src/main/java/de/bsvrz/dua/progglaette/progglaette/GlaetteWarnungUndPrognose.java # src/main/java/de/bsvrz/dua/progglaette/progglaette/package-info.java # src/test/java/de/bsvrz/dua/progglaette/tests/DuAProgGlaetteTestBase.java # src/test/java/de/bsvrz/dua/progglaette/tests/TestDuAProgGlaette.java
Loading
Please register or sign in to comment