From: Friendika <info@friendika.com>
Date: Mon, 24 Oct 2011 22:49:28 +0000 (-0700)
Subject: Merge pull request #35 from fabrixxm/master
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ea9d3b06f6dbe2d7bf036ea1785a1e472f6bf890;p=friendica.git

Merge pull request #35 from fabrixxm/master

Use oembed if possible without the addon

Awesome!
---

ea9d3b06f6dbe2d7bf036ea1785a1e472f6bf890
diff --cc boot.php
index 86b219dc2b,9623b4b141..6a43806ab6
--- a/boot.php
+++ b/boot.php
@@@ -6,11 -6,12 +6,12 @@@ 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.1140' );
 +define ( 'FRIENDIKA_VERSION',      '2.3.1143' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 -define ( 'DB_UPDATE_VERSION',      1097      );
 +define ( 'DB_UPDATE_VERSION',      1098      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );