Juan Ferrer 26c2ab867d Merge pull request 'master into test' (!1546) from master into test ... Reviewed-on: #1546		2023-05-22 17:04:32 +00:00
..
methods	correct type	2023-05-22 14:45:00 +02:00
models	deploy: 231401 test to dev	2023-04-21 12:49:03 +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