Vicent Llopis f37974c835 Merge branch 'dev' into 5468-account_privileges		2023-06-20 12:39:27 +00:00
..
methods	Merge branch 'dev' into 5554-renovar_token	2023-06-20 12:07:52 +00:00
models	Merge branch 'dev' into 5468-account_privileges	2023-06-20 12:39:27 +00:00
helpers.spec.js	Resolved conflicts	2022-08-10 12:13:31 +02:00
model-config.json	refs #554 feat: actualizar el token automáticamente	2023-05-24 15:01:59 +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	refs #5160 increase jasmine timeout	2023-05-16 09:14:38 +02:00