Commit Graph

2 Commits

Author SHA1 Message Date
fbsanchez 9ba2eb0c74 Merge remote-tracking branch 'origin/develop' into ent-8161-deshabilitar-reglas-de-autoconfiguracion-en-nodos-a-demanda
Conflicts:
	pandora_console/extras/mr/52.sql
	pandora_console/pandoradb.sql
2022-02-10 18:52:51 +01:00
Daniel Barbero Martin a803b5fa90 WIP #3943 2021-12-17 13:38:53 +01:00