Marc Beyer 12fce27d04 Merge remote-tracking branch 'origin/merge' into merge ...

# Conflicts:
#	client/data/src/main/java/res/Event.java

2022-01-10 13:24:42 +01:00

..

DataController.java

Merge remote-tracking branch 'origin/merge' into merge

2022-01-10 13:24:42 +01:00

Event.java

Changed REST-endpoints

2022-01-10 13:22:59 +01:00

HttpRequest.java

Formatted code

2021-12-22 15:04:15 +01:00