laf 04a4987a23 Merge branch 'master' of github.com:laf/librenms into issue-laf-110-new ...

Conflicts:
	includes/defaults.inc.php

2015-05-25 18:06:49 +01:00

..

apps

…

edit

…

graphs

…

health

…

loadbalancer

…

logs

…

overview

…

port

…

ports

…

routing

…

accesspoint.inc.php

…

accesspoints.inc.php

…

alert-stats.inc.php

…

alerts.inc.php

…

apps.inc.php

…

collectd.inc.php

…

edit.inc.php

…

entphysical.inc.php

…

graphs.inc.php

…

health.inc.php

…

hrdevice.inc.php

…

latency.inc.php

…

loadbalancer.inc.php

…

logs.inc.php

…

map.inc.php

…

munin.inc.php

…

nfsen.inc.php

…

overview.inc.php

…

packages.inc.php

…

port.inc.php

…

ports.inc.php

…

processes.inc.php

…

pseudowires.inc.php

…

routing.inc.php

…

services.inc.php

…

showconfig.inc.php

…

slas.inc.php

…

toner.inc.php

…

vlans.inc.php

…

vm.inc.php

…