Christoph c7d5e02f0b Merge remote-tracking branch 'origin/event-db' ...

# Conflicts:
#	src/main/java/mops/gruppen2/domain/Aggregate.java
#	src/main/java/mops/gruppen2/service/GroupService.java
#	src/test/java/mops/gruppen2/domain/GroupTest.java

2020-03-10 13:24:29 +01:00

..

java/mops/gruppen2

Merge remote-tracking branch 'origin/event-db'

2020-03-10 13:24:29 +01:00

resources

Merge branch 'html-gruppe' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into html-gruppe

2020-03-09 23:22:14 +01:00