Ignacio Martinez Navajas c4ff55654d Merge branch 'main' into 'dev/settings' ...

# Conflicts:
#   ci4/app/Config/Routes.php

2023-05-28 14:58:36 +00:00

..

focus2

modificada la forma de obtener la lista de grupos para el index de los usuarios

2023-05-09 13:11:42 +02:00

vuexy

Merge branch 'main' into 'dev/settings'

2023-05-28 14:58:36 +00:00