f0o 3be0b85846 Resolved upstream-conflicts: ...

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

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

..

apache.inc.php

…

bind.inc.php

…

drbd.inc.php

…

mailscanner.inc.php

…

memcached.inc.php

…

mysql.inc.php

…

nginx.inc.php

…

ntp-client.inc.php

…

ntpd-server.inc.php

…

powerdns.inc.php

…

shoutcast.inc.php

…

tinydns.inc.php

…