Christoph fdd9d44aac fix merge errors ...

Co-authored-by: Christoph <tobi@urpost.de>

2020-03-19 00:00:33 +01:00

..

EventDTO.java

fix merge errors

2020-03-19 00:00:33 +01:00

InviteLinkDTO.java

fix merge errors

2020-03-19 00:00:33 +01:00