Alejandro Campos
|
d4054f15d0
|
Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora'
# Conflicts:
# pandora_console/extras/mr/45.sql
# pandora_console/godmode/alerts/configure_alert_action.php
# pandora_server/util/pandora_db.pl
|
2021-03-04 10:27:07 +00:00 |
Daniel Maya
|
208c0d10e8
|
Ent 6879 separar en alertas de inventario el selector de grupos de acl del selector de grupos sobre el que se aplican las alertas
|
2021-03-01 10:35:28 +00:00 |
fbsanchez
|
ad347dc953
|
errata fix
|
2021-02-26 12:48:23 +01:00 |
|
fbsanchez
|
d41b189612
|
Extra lines after mr file
|
2021-02-25 13:27:00 +01:00 |
|
alejandro.campos@artica.es
|
901d12fec0
|
Integration with Integria
|
2021-02-25 13:18:04 +01:00 |
|
fbsanchez
|
34a19b969c
|
missed mr file
|
2021-02-22 12:04:12 +01:00 |