52e6dda3b4
Resolved conflicts: pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql pandora_console/include/styles/pandora.css |
||
---|---|---|
.. | ||
agentes | ||
alerts | ||
category | ||
db | ||
events | ||
gis_maps | ||
groups | ||
massive | ||
modules | ||
netflow | ||
reporting | ||
servers | ||
setup | ||
snmpconsole | ||
tag | ||
update_manager | ||
users | ||
admin_access_logs.php | ||
audit_log_csv.php | ||
extensions.php | ||
menu.php |