Daniel Barbero Martin 337450a1f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center ... Conflicts: pandora_console/ajax.php pandora_console/extras/delete_files/delete_files.txt		2021-05-24 17:41:28 +02:00
..
.gitignore	fixed errors delete files update manager open and metaconsole	2019-03-20 13:35:24 +01:00
delete_files.txt	Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center	2021-05-24 17:41:28 +02:00