Merge remote-tracking branch 'origin/master' into next

This commit is contained in:
Arne Fitzenreiter
2015-10-22 23:38:27 +02:00
2 changed files with 5 additions and 5 deletions

View File

@@ -16,6 +16,11 @@
'title' => "$Lang::tr{'wlan client'}",
'enabled' => 0,
};
$subsystem->{'22.dma'} = {'caption' => $Lang::tr{'email settings'},
'uri' => '/cgi-bin/mail.cgi',
'title' => "$Lang::tr{'email settings'}",
'enabled' => 1,
};
$subsystem->{'30.ssh'} = {
'caption' => $Lang::tr{'ssh access'},
'uri' => '/cgi-bin/remote.cgi',

View File

@@ -20,11 +20,6 @@
'title' => "$Lang::tr{'time server'}",
'enabled' => 1,
};
$subservices->{'41.dma'} = {'caption' => $Lang::tr{'email settings'},
'uri' => '/cgi-bin/mail.cgi',
'title' => "$Lang::tr{'email settings'}",
'enabled' => 1,
};
$subservices->{'50.qos'} = {'caption' => 'Quality of Service',
'uri' => '/cgi-bin/qos.cgi',
'title' => "Quality of Service",