Skip to content
Commit 14fc8b8c authored by Christian Kniss's avatar Christian Kniss
Browse files

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
parents dcad993c 72210acf
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment