pandorafms/pandora_console/extras
José González 0d8e2d5021 Merge branch 'develop' into 'ent-5847-optimizacion-recomendada-Gautier'
# Conflicts:
#   pandora_console/extras/mr/42.sql

Solved conflicts.
2020-09-25 11:27:41 +02:00
..
delete_files Remove file - old cluster files 2020-05-22 14:15:10 +02:00
mr Merge branch 'develop' into 'ent-5847-optimizacion-recomendada-Gautier' 2020-09-25 11:27:41 +02:00
check_other_languages.sh
pandora_diag.php continue feedback mail 2019-10-23 19:50:57 +02:00
pandoradb_migrate_5.1_to_6.0.mysql.sql
pandoradb_migrate_6.0_to_7.0.mysql.sql Merge branch 'develop' into 'ent-5847-optimizacion-recomendada-Gautier' 2020-09-25 11:27:41 +02:00
sample_login.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00