christoph/lecture-professional-software-development
1
Fork 0
Code Activity
Files
55fa269edbe7e0dd67a439989544f1d2e6d5e645
lecture-professional-softwa…/src/test
History
killerber4t 55fa269edb Merge remote-tracking branch 'origin/master' into ControllerServiceTests 
# Conflicts:
#	src/main/java/mops/gruppen2/service/ControllerService.java
#	src/main/java/mops/gruppen2/service/GroupService.java
#	src/test/java/mops/gruppen2/service/ControllerServiceTest.java
#	src/test/java/mops/gruppen2/service/GroupServiceTest.java
2020-03-27 14:48:54 +01:00
..
java/mops/gruppen2
Merge remote-tracking branch 'origin/master' into ControllerServiceTests
2020-03-27 14:48:54 +01:00