Conflicts: pandora_console/extras/delete_files/delete_files.txt pandora_console/include/javascript/pandora_ui.js |
||
---|---|---|
.. | ||
PandoraFMS | ||
pandora_exec | ||
pandora_exec.exe | ||
pandora_server | ||
tentacle_server | ||
tentacle_server.exe |
Conflicts: pandora_console/extras/delete_files/delete_files.txt pandora_console/include/javascript/pandora_ui.js |
||
---|---|---|
.. | ||
PandoraFMS | ||
pandora_exec | ||
pandora_exec.exe | ||
pandora_server | ||
tentacle_server | ||
tentacle_server.exe |