From 0c259682f65eaaf23ea4ccb56a706d6baf3007e4 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 13 Apr 2012 04:52:02 -0400
Subject: [PATCH] - Merge devel-framework branch, resolved conflicts

---
 installer/index.php |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/installer/index.php b/installer/index.php
index 65e84a3..842b900 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -53,6 +53,8 @@
 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();

--
Gitblit v1.9.1