Alex Moreno 1c39ad873c resolve dev conflicts		2023-06-12 11:06:45 +02:00
..
locale	refs #5667 RoleInherit & Sms: Translations added	2023-06-05 08:35:07 +02:00
methods	resolve dev conflicts	2023-06-12 11:06:45 +02:00
mixins	User syncronization fixes, improvements, refactor	2020-11-12 23:20:25 +01:00
models	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-08 12:39:36 +02:00
util	Account synchronization fixes	2020-11-13 13:20:37 +01: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