Commit Graph

7 Commits

Author SHA1 Message Date
Alejandro Campos f297f6fff9 Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas'
# Conflicts:
#   pandora_console/extras/mr/62.sql
#   pandora_console/pandoradb.sql
2023-03-02 16:53:42 +00:00
Diego Muñoz-Reja 5d756ee393 Merge branch 'ent-9819-crear-tip-en-consola-sonora-de-eventos' into 'develop'
Ent 9819 crear tip en consola sonora de eventos

See merge request artica/pandorafms!5466
2023-03-02 15:25:31 +00:00
Jonathan 590ddc827c #9819 Change MR and add pandoradb.sql create table teventsound 2023-03-02 08:29:06 +01:00
Jonathan 2f4543a023 #9517 Change MR sql 2023-03-02 08:20:43 +01:00
Alejandro Campos f94c7e2a04 Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas'
# Conflicts:
#   pandora_console/extras/mr/62.sql
2023-02-28 16:11:46 +00:00
Calvo d1a3795acb Added new indexes to mr and pandoradb 2023-02-23 12:58:33 +01:00
alejandro.campos@artica.es 2a9494b48d fix conflicts 2023-02-22 10:10:59 +01:00