José González fc4b702db0 Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs' ... # Conflicts: # pandora_console/godmode/alerts/configure_alert_template.php		2022-02-08 11:35:01 +00:00
..
ajax.php	…
gis_map.php	…
public_console.php	…
render_view.php	Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs'	2022-02-08 11:35:01 +00:00