3c87efe113
Conflicts: pandora_console/extras/mr/33.sql |
||
---|---|---|
.. | ||
delete_files | ||
mr | ||
check_other_languages.sh | ||
pandora_diag.php | ||
pandoradb_migrate_5.1_to_6.0.mysql.sql | ||
pandoradb_migrate_6.0_to_7.0.mysql.sql | ||
sample_login.php |