fixed merge conflict #25

Merged
chreder merged 1 commit from mergeconflict into main 2025-10-16 21:09:51 +00:00
chreder commented 2025-10-16 21:09:16 +00:00 (Migrated from gitlab.com)
No description provided.
chreder commented 2025-10-16 21:09:16 +00:00 (Migrated from gitlab.com)

requested review from @JohannesSeidl

requested review from @JohannesSeidl
chreder commented 2025-10-16 21:09:16 +00:00 (Migrated from gitlab.com)

assigned to @chreder

assigned to @chreder
Timothee26 (Migrated from gitlab.com) approved these changes 2025-10-16 21:09:16 +00:00
Timothee26 commented 2025-10-16 21:09:51 +00:00 (Migrated from gitlab.com)

approved this merge request

approved this merge request
JohannesSeidl (Migrated from gitlab.com) merged commit 4f476dd91e into main 2025-10-16 21:09:51 +00:00
JohannesSeidl commented 2025-10-16 21:09:52 +00:00 (Migrated from gitlab.com)

mentioned in commit 4f476dd91e

mentioned in commit 4f476dd91ec35cb8766a568df6ef726887833916
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
swen3/document-management-system!25
No description provided.