-
A. Täffner authored
Merge branch 'nagios-implementation' of git.ispconfig.org:darkalex/ispconfig3 into nagios-implementation Conflicts: interface/web/monitor/show_nagios.php interface/web/monitor/templates/show_nagios.htm
79ec89cd
Merge branch 'nagios-implementation' of git.ispconfig.org:darkalex/ispconfig3 into nagios-implementation Conflicts: interface/web/monitor/show_nagios.php interface/web/monitor/templates/show_nagios.htm