Javier Segarra 074bb2b980 Merge branch 'dev' into 5666-loggable_to_mixin		2023-12-13 06:30:14 +00:00
..
methods	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-12-05 13:02:34 +01:00
models	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-12-05 13:02:34 +01:00
helpers.spec.js	Resolved conflicts	2022-08-10 12:13:31 +02:00
model-config.json	refs #5666 feat: change models permissions	2023-12-05 07:15:22 +01: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	Update back/tests.js	2023-12-07 19:05:54 +00:00