fix: solve conflicts from master to test #777

Merged
alexm merged 1 commits from mergeConflicts into test 2024-09-30 13:02:14 +00:00
Member
No description provided.
jsegarra added 1 commit 2024-09-30 13:00:28 +00:00
gitea/salix-front/pipeline/pr-test This commit looks good Details
2302e22f11
fix: solve conflicts from master to test
jsegarra requested review from alexm 2024-09-30 13:00:30 +00:00
alexm approved these changes 2024-09-30 13:02:10 +00:00
alexm merged commit 35179695c3 into test 2024-09-30 13:02:14 +00:00
alexm deleted branch mergeConflicts 2024-09-30 13:02:14 +00:00
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
2 Participants
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: verdnatura/salix-front#777
No description provided.