Alex Moreno 6f06bac0c1 Merge branch 'dev' into 4797-worker-notification-selector		2023-05-23 05:55:08 +00:00
..
methods	Merge branch 'dev' into 4797-worker-notification-selector	2023-05-23 05:55:08 +00:00
models	refs #4797 minor fixes	2023-05-10 14:10:00 +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