Merge branch 'pull'

This commit is contained in:
Friendika 2011-10-24 15:51:14 -07:00
commit 4218e3f494
13 changed files with 109 additions and 38 deletions

View file

@ -6,6 +6,7 @@ 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.1144' );