Jaime Jimenez Ortega f10226606c Merge branch 'main' into 'dev/papelimp_tip3' ...

# Conflicts:
#   ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionForm.php

2023-06-12 07:43:28 +00:00

..

activity

Menus segun JM

2023-06-06 13:57:34 +02:00

configuracion

Merge branch 'main' into 'dev/papelimp_tip3'

2023-06-12 07:43:28 +00:00

dashboard

Added original Vuexy files and cloned focus2 views into vuexy views for its conversion

2023-05-06 13:01:53 +02:00

group

Settings 24/05 morning

2023-05-24 15:36:21 +02:00

login

Igualando a rama dev/formateando

2023-05-16 10:49:31 +02:00

my

Added original Vuexy files and cloned focus2 views into vuexy views for its conversion

2023-05-06 13:01:53 +02:00

notification

Added original Vuexy files and cloned focus2 views into vuexy views for its conversion

2023-05-06 13:01:53 +02:00

profile

Trabajando en perfil (tarde)

2023-05-23 22:16:01 +02:00

settings

Menus segun JM

2023-06-06 13:57:34 +02:00

tarifas

Settings and UI changes

2023-05-28 16:50:56 +02:00

user

Edicion de algunos formularios

2023-06-02 09:10:19 +02:00