Ignacio Martinez Navajas 976f871a48 Merge branch 'main' into 'dev/views' ...

# Conflicts:
#   ci4/.env
#   ci4/app/Controllers/Test.php

2023-06-20 13:30:37 +00:00

..

_commonPartialsBs

Cambios en vistas

2023-06-20 15:27:45 +02:00

backend/vuexy

Merge branch 'main' into 'dev/views'

2023-06-20 13:30:37 +00:00

frontend/tivo/main

Commit realizando cambios en los roles de los usuarios

2023-04-24 13:00:46 +02:00