From: Friendika <info@friendika.com>
Date: Mon, 24 Oct 2011 22:51:14 +0000 (-0700)
Subject: Merge branch 'pull'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4218e3f4945af7101c626852bda09d2c591b8e0c;p=friendica.git

Merge branch 'pull'
---

4218e3f4945af7101c626852bda09d2c591b8e0c
diff --cc boot.php
index 143d850a9a,6a43806ab6..86a37ce90b
--- a/boot.php
+++ b/boot.php
@@@ -6,9 -6,10 +6,10 @@@ require_once('include/plugin.php')
  require_once('include/text.php');
  require_once("include/pgettext.php");
  require_once('include/nav.php');
+ require_once('include/cache.php');
  
  define ( 'FRIENDIKA_PLATFORM',     'Free Friendika');
 -define ( 'FRIENDIKA_VERSION',      '2.3.1143' );
 +define ( 'FRIENDIKA_VERSION',      '2.3.1144' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
  define ( 'DB_UPDATE_VERSION',      1098      );