Marco Kühn 5a4a1e70e8 merged 0300 and 0120		2021-11-26 13:30:51 +01:00
..
java/client	Merge branch '0300-Kalender' into merge	2021-11-26 13:25:05 +01:00
resources/client	merged 0300 and 0120	2021-11-26 13:30:51 +01:00