Carlos Satorres 12165ab382 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail		2024-01-03 08:31:07 +01:00
..
methods	refs #5925 fix: add options	2024-01-02 08:12:45 +01:00
models	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail	2024-01-03 08:31:07 +01:00
helpers.spec.js	Resolved conflicts	2022-08-10 12:13:31 +02:00
model-config.json	refs #6141feat:buyer model	2023-09-14 08:27:49 +02:00
nodemonConfig.json	Resolved conflicts	2022-08-10 12:13:31 +02:00
process.yml	refs #5860 fix hash smbhash	2023-06-16 12:19:59 +02:00
tests.js	Update back/tests.js	2023-12-07 19:05:54 +00:00