From 6ddb16d181e285d4f0ef0ef55bdd0ba787f1b583 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sat, 17 Nov 2012 10:24:09 -0500
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
program/include/rcube_config.php | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 1f165ba..dab5394 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -22,7 +22,8 @@
/**
* Configuration class for Roundcube
*
- * @package Core
+ * @package Framework
+ * @subpackage Core
*/
class rcube_config
{
@@ -43,6 +44,8 @@
'mail_pagesize' => 'pagesize',
'addressbook_pagesize' => 'pagesize',
'reply_mode' => 'top_posting',
+ 'refresh_interval' => 'keep_alive',
+ 'min_refresh_interval' => 'min_keep_alive',
);
--
Gitblit v1.9.1