[pkg-horde] [SCM] Debian Horde Packages repository: imp4 package branch, debian-sid, updated. debian/4.3.6+debian0-2-5-g0f83162
Gregory Colpart
gcolpart at ioakim2.evolix.net
Sat May 22 14:56:02 UTC 2010
The following commit has been merged in the debian-sid branch:
commit 9a146bb7aeb03fc5b7244a38005852083cd6b58a
Merge: f18ec55a0fb0bfbda86d8e1ab8c7ccc0db8d2d2b c6057bb5b712d6d5e68bf20565c1258f92937563
Author: Gregory Colpart <gcolpart at ioakim2.evolix.net>
Date: Tue May 11 00:35:31 2010 +0200
Merge branch 'upstream+repack' into debian-sid
diff --combined config/servers.php.dist
index 579f101,58185cd..08296b2
--- a/config/servers.php.dist
+++ b/config/servers.php.dist
@@@ -1,6 -1,6 +1,6 @@@
<?php
/**
- * $Horde: imp/config/servers.php.dist,v 1.50.2.23 2008-07-03 13:06:15 jan Exp $
+ * $Horde: imp/config/servers.php.dist,v 1.50.2.23 2008/07/03 13:06:15 jan Exp $
*
* This file is where you specify what mail servers people using your
* installation of IMP can log in to.
@@@ -301,9 -301,6 +301,9 @@@ $servers['exchange'] = array
);
if ($GLOBALS['conf']['kolab']['enabled']) {
+ // When using Kolab, other mail servers are removed
+ $servers = Array();
+
require_once 'Horde/Kolab.php';
if (!is_callable('Kolab', 'getServer')) {
--
Debian Horde Packages repository: imp4 package
More information about the pkg-horde-hackers
mailing list