LukasEttel 37a7e98bc3 Merge remote-tracking branch 'origin/Services' into Services ...

# Conflicts:
#	src/test/java/mops/gruppen2/entities/GruppeTest.java

2020-03-06 16:08:54 +01:00

..

entities

Merge remote-tracking branch 'origin/Services' into Services

2020-03-06 16:08:54 +01:00

Gruppen2ApplicationTests.java

fix folders

2020-03-03 14:13:02 +01:00