fbsanchez f52d389327 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center ... Conflicts: pandora_console/extras/mr/48.sql		2021-07-05 09:55:14 +02:00
..
PandoraFMS	spec console open and build_rpm for rhel7	2019-04-11 13:45:57 +02:00
pandora_exec	…
pandora_exec.exe	…
pandora_server	Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center	2021-07-05 09:55:14 +02:00
tentacle_server	Cleaned openideas links	2020-09-07 11:54:33 +02:00
tentacle_server.exe	…