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	Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"	2021-11-04 16:28:15 +01:00
gis_map.php	Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"	2021-11-04 16:28:15 +01:00
public_console.php	Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"	2021-11-04 16:28:15 +01:00
render_view.php	Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs'	2022-02-08 11:35:01 +00:00