tomvahl 64fe9c387d Merge branch 'master' into killertester ...

# Conflicts:
#	src/test/java/mops/gruppen2/service/EventServiceTest.java

2020-03-24 13:08:58 +01:00

..

java/mops/gruppen2

Merge branch 'master' into killertester

2020-03-24 13:08:58 +01:00

resources

Merge remote-tracking branch 'origin/master'

2020-03-23 17:08:46 +01:00