XXNitram 4b6e8eae39 Merge remote-tracking branch 'origin/master' into import-csv-in-overview ...

# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
#	src/main/resources/templates/editMembers.html

2020-03-18 17:36:06 +01:00

..

mops/gruppen2

Merge remote-tracking branch 'origin/master' into import-csv-in-overview

2020-03-18 17:36:06 +01:00