christoph/lecture-professional-software-development
1
Fork 0
Code Activity
Files
b431361eec0751f4f70c53ff709262c87d0fe43b
lecture-professional-softwa…/src/test
History
[Mahgs] 722cd80831 Merge remote-tracking branch 'origin/master' into group-invite-links 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/repository/EventRepository.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
#	src/main/java/mops/gruppen2/service/GroupService.java
2020-03-18 13:18:34 +01:00
..
java/mops/gruppen2
Merge remote-tracking branch 'origin/master' into group-invite-links
2020-03-18 13:18:34 +01:00