Alex Moreno 6ddbd8b8ea Merge branch 'dev' into 5488-use_checkAccessAcl		2023-05-17 11:43:25 +00:00
..
locale/account	refs #5517 añadidas traducciones de algunos modelos	2023-04-12 15:02:21 +02:00
methods	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-05 14:11:47 +02:00
models	fix(imageCollection):	2023-04-28 11:54:11 +02:00
helpers.spec.js	Resolved conflicts	2022-08-10 12:13:31 +02:00
model-config.json	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-04-18 11:41:55 +02:00
nodemonConfig.json	Resolved conflicts	2022-08-10 12:13:31 +02:00
process.yml	PM2 Min TLS v1.0	2020-06-17 14:07:14 +02:00
tests.js	refs #5160 increase jasmine timeout	2023-05-16 09:14:38 +02:00