From d61fd77d83926d892645a15e00c3443d2a8a6368 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Fri, 13 Apr 2012 08:52:02 +0000
Subject: - Merge devel-framework branch, resolved conflicts

git-svn-id: https://svn.roundcube.net/trunk@6073 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/installer/index.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'roundcubemail/installer/index.php')

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();
-- 
cgit v1.2.3