f0o 3be0b85846 Resolved upstream-conflicts: ...

html/pages/apps.inc.php
	includes/polling/unix-agent.inc.php

2015-01-18 06:37:22 +00:00

..

alerts

…

db

…

discovery

…

phpmailer

…

polling

…

services

…

snmptrap

…

sql-schema

…

alerts.inc.php

…

billing.php

…

cisco-entities.php

…

common.php

…

console_colour.php

…

console_table.php

…

dbFacile.php

…

defaults.inc.php

…

definitions.inc.php

…

functions.php

…

include-dir.inc.php

…

port-descr-parser.inc.php

…

rewrites.php

…

rrdtool.inc.php

…

services.inc.php

…

snmp.inc.php

…

snom-graphing.php

…

static-config.php

phpDocumentator headers. retire static-config. IF YOU ARE READING THIS, REMOVE IT FROM THE BOTTOM YOUR CONFIG.PHP. YES. YOU.

2012-05-09 10:01:42 +00:00

syslog.php

…

versioncheck.inc.php

…

vmware_guestid.inc.php

…