summaryrefslogtreecommitdiff
path: root/roundcubemail/installer/index.php
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-04-13 08:52:02 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-04-13 08:52:02 +0000
commitd61fd77d83926d892645a15e00c3443d2a8a6368 (patch)
tree83ede4b27294a42a45ee988751f51182994e0de7 /roundcubemail/installer/index.php
parent8a3df3f032059464ebaab2dde26ab0d24b186572 (diff)
- Merge devel-framework branch, resolved conflicts
git-svn-id: https://svn.roundcube.net/trunk@6073 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/installer/index.php')
-rw-r--r--roundcubemail/installer/index.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/roundcubemail/installer/index.php b/roundcubemail/installer/index.php
index 65e84a3b4..842b90054 100644
--- a/roundcubemail/installer/index.php
+++ b/roundcubemail/installer/index.php
@@ -53,6 +53,8 @@ $include_path .= ini_get('include_path');
set_include_path($include_path);
require_once 'utils.php';
+require_once 'rcube_shared.inc';
+// deprecated aliases (to be removed)
require_once 'main.inc';
session_start();