fix conflicts #361

Merged
jorgep merged 5 commits from testToDev into dev 2024-05-07 14:37:08 +00:00

5 Commits

Author SHA1 Message Date
Jorge Penadés 392d1892ba Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into testToDev
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-07 16:19:13 +02:00
Jorge Penadés 0e7c2c7118 Merge pull request '#6938-warmfix' (!359) from 6938-warmfix into test
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/pr-master This commit looks good Details
Reviewed-on: #359
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-07 14:21:13 +00:00
Jorge Penadés 5e0db81a21 fix: refs #6938 conflicts
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-05-07 15:51:55 +02:00
Jorge Penadés ac0ebf431f Merge pull request '#6938 wamfix workerCard' (!357) from 6938-warmfix-masterToTest into test
gitea/salix-front/pipeline/head There was a failure building this commit Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
Reviewed-on: #357
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-05-07 13:37:05 +00:00
Jorge Penadés 0a71060f60 fix: refs #6938 workerCard
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-05-07 15:28:00 +02:00