Merge branch 'master' of github.com:Froxlor/Froxlor

2014-05-24 09:12:06 +02:00
parent 48f288789f 0574a9733c
commit 4167451da6
11 changed files with 586 additions and 428 deletions
--- a/lib/configfiles/lucid.inc.php
+++ b/lib/configfiles/lucid.inc.php
@@ -36,7 +36,7 @@ if ($vmail_group === false) {

 return array(
 	'ubuntu_lucid' => array(
-		'label' => 'Ubuntu 10.04 (Lucid)',
+		'label' => 'Ubuntu 10.04 (Lucid) [deprecated]',
 		'services' => array(
 			'http' => array(
 				'label' => $lng['admin']['configfiles']['http'],