Alex Moreno 1c39ad873c resolve dev conflicts		2023-06-12 11:06:45 +02:00
..
methods	WIP: d735f142a Merge branch 'dev' into 5472-user_passExpired	2023-06-12 10:46:21 +02:00
models	resolve dev conflicts	2023-06-12 11:06:45 +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