LukasEttel 1754486625 Merge remote-tracking branch 'origin/master' into updateGroupsAPI ...

# Conflicts:
#	src/main/java/mops/gruppen2/repository/EventRepository.java

2020-03-12 16:31:23 +01:00

..

java/mops/gruppen2

Merge remote-tracking branch 'origin/master' into updateGroupsAPI

2020-03-12 16:31:23 +01:00

resources

Edit index.html

2020-03-12 15:49:02 +01:00