Jorge Penadés 92b4908b35 fix conflicts: refs #6276		2024-01-02 09:42:41 +01:00
..
en.json	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-02 09:41:47 +01:00
es.json	fix conflicts: refs #6276	2024-01-02 09:42:41 +01:00