[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 39ed5389fc6de2c7f602d26ba21f0cf9e5fdabc6

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 39ed5389fc6de2c7f602d26ba21f0cf9e5fdabc6

[git]

[-- Attachment #1: Type: text/plain, Size: 2298 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  39ed5389fc6de2c7f602d26ba21f0cf9e5fdabc6 (commit)
       via  374e636feeade7827e8bea834ee911d15530650f (commit)
      from  159c9eb9b1ac6144db50e4677132c51ddf2d8ceb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 39ed5389fc6de2c7f602d26ba21f0cf9e5fdabc6
Merge: 159c9eb 374e636
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Oct 22 23:38:27 2015 +0200

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

-----------------------------------------------------------------------

Summary of changes:
 config/menu/10-system.menu   | 5 +++++
 config/menu/40-services.menu | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/config/menu/10-system.menu b/config/menu/10-system.menu
index 5755366..3b84e31 100644
--- a/config/menu/10-system.menu
+++ b/config/menu/10-system.menu
@@ -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',
diff --git a/config/menu/40-services.menu b/config/menu/40-services.menu
index aaf1ad7..2f4d96e 100644
--- a/config/menu/40-services.menu
+++ b/config/menu/40-services.menu
@@ -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",


hooks/post-receive
--
IPFire 2.x development tree