tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
pandorafms/pandora_server/conf
History
fbsanchez 5423e78d62 Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/agentes/configurar_agente.php
	pandora_console/godmode/wizards/Wizard.main.php
	pandora_console/include/functions_agents.php
	pandora_console/include/styles/alert.css
	pandora_console/pandoradb.sql
	pandora_server/lib/PandoraFMS/Recon/Base.pm
 		2019-11-22 15:49:07 +01:00
..
pandora_server.conf.new Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs 2019-11-22 15:49:07 +01:00
pandora_server.conf.windows Added feature sample_agent 2019-10-22 11:54:27 +02:00
tentacle_server.conf.new Add menu omnishell 2019-11-21 18:21:46 +01:00