José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados' ...

# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php

2020-12-14 11:10:35 +01:00

..

pandora_server

2014-08-22 Koichiro Kikuchi <koichiro@rworks.jp>

2014-08-22 08:29:34 +00:00

pandora_server.conf.new

Merge branch 'develop' into 'ent-1175-copyright-actualizados'

2020-12-14 11:10:35 +01:00

tentacle_server

Fixed tentacle server startup script for FreeBSD.

2020-07-13 13:42:43 +09:00