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 |
||
---|---|---|
.. | ||
agent.php | ||
alert_list.ajax.php | ||
double_auth.ajax.php | ||
events.php | ||
graph.ajax.php | ||
menu.ajax.php | ||
module.php | ||
networkmap.ajax.php | ||
planned_downtime.ajax.php | ||
reporting.ajax.php | ||
skins.ajax.php | ||
update_manager.ajax.php | ||
visual_console_builder.ajax.php |