4 Commits

Author	SHA1	Message	Date
Alexander Schulz	b3d88b88f5	Merge branch 'conflict' merge completed	2024-09-13 20:29:18 +02:00
Alexander Schulz	cf582793f9	hotfix on branch main	2024-09-13 20:22:27 +02:00
Alexander Schulz	1211942a0c	modified neue file	2024-09-13 20:20:42 +02:00
Alexander Schulz	9cecd122e9	adde new fiel	2024-09-13 19:55:30 +02:00