#7897 - Solve conflicts masterTest_24_36 #670

Merged
jsegarra merged 3 commits from 7897_masterTest_24_36 into test 2024-09-03 05:40:48 +00:00

3 Commits

Author SHA1 Message Date
Javier Segarra e9da8d44f0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7897_masterTest_24_36
gitea/salix-front/pipeline/pr-master This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-09-02 19:31:54 +02:00
Jorge Penadés 124194ddcb Merge pull request 'fix: refs #7831 add locale & hide table params' (!660) from 7831-hotfix-addLocale into master
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
Reviewed-on: #660
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-08-30 14:08:36 +00:00
Jorge Penadés 1cdbc0fcc1 fix: refs #7831 add locale & hide table params
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-08-30 12:51:25 +02:00