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 |
||
---|---|---|
.. | ||
check_other_languages.sh | ||
pandora_diag.php | ||
pandoradb_migrate_5.1_to_6.0.mysql.sql | ||
pandoradb_migrate_5.1_to_6.0.oracle.sql | ||
pandoradb_migrate_5.1_to_6.0.postgreSQL.sql | ||
sample_login.php |