cedcc4f078
# Conflicts: # app/src/main/java/de/labor_stein/befund/Core/Https/Servers.java |
||
---|---|---|
.. | ||
androidTest/java/de/labor_stein/befund | ||
main | ||
test/java/de/labor_stein/befund |
cedcc4f078
# Conflicts: # app/src/main/java/de/labor_stein/befund/Core/Https/Servers.java |
||
---|---|---|
.. | ||
androidTest/java/de/labor_stein/befund | ||
main | ||
test/java/de/labor_stein/befund |